Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c0e2f440
Commit
c0e2f440
authored
May 13, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use wrapper script to prevent crazy LD_XXX flags
parent
1412fcbb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
118 additions
and
101 deletions
+118
-101
bootstages.c
native/jni/core/bootstages.c
+13
-2
magisk.c
native/jni/core/magisk.c
+105
-99
No files found.
native/jni/core/bootstages.c
View file @
c0e2f440
...
@@ -465,6 +465,12 @@ static void unblock_boot_process() {
...
@@ -465,6 +465,12 @@ static void unblock_boot_process() {
pthread_exit
(
NULL
);
pthread_exit
(
NULL
);
}
}
static
const
char
wrapper
[]
=
"#!/system/bin/sh
\n
"
"unset LD_LIBRARY_PATH
\n
"
"unset LD_PRELOAD
\n
"
"exec /sbin/magisk.bin
\"
${0##*/}
\"
\"
$@
\"\n
"
;
void
startup
()
{
void
startup
()
{
if
(
!
check_data
())
if
(
!
check_data
())
return
;
return
;
...
@@ -537,12 +543,17 @@ initialize:
...
@@ -537,12 +543,17 @@ initialize:
setfilecon
(
"/sbin"
,
"u:object_r:rootfs:s0"
);
setfilecon
(
"/sbin"
,
"u:object_r:rootfs:s0"
);
sbin
=
xopen
(
"/sbin"
,
O_RDONLY
|
O_CLOEXEC
);
sbin
=
xopen
(
"/sbin"
,
O_RDONLY
|
O_CLOEXEC
);
//
Setup magisk symlinks
//
Create wrapper
fd
=
creat
(
"/sbin/magisk"
,
0755
);
fd
=
creat
(
"/sbin/magisk"
,
0755
);
xwrite
(
fd
,
wrapper
,
sizeof
(
wrapper
)
-
1
);
close
(
fd
);
setfilecon
(
"/sbin/magisk"
,
"u:object_r:"
SEPOL_FILE_DOMAIN
":s0"
);
// Setup magisk symlinks
fd
=
creat
(
"/sbin/magisk.bin"
,
0755
);
xwrite
(
fd
,
magisk
,
magisk_size
);
xwrite
(
fd
,
magisk
,
magisk_size
);
close
(
fd
);
close
(
fd
);
free
(
magisk
);
free
(
magisk
);
setfilecon
(
"/sbin/magisk"
,
"u:object_r:"
SEPOL_FILE_DOMAIN
":s0"
);
setfilecon
(
"/sbin/magisk
.bin
"
,
"u:object_r:"
SEPOL_FILE_DOMAIN
":s0"
);
for
(
int
i
=
0
;
applet
[
i
];
++
i
)
{
for
(
int
i
=
0
;
applet
[
i
];
++
i
)
{
snprintf
(
buf
,
PATH_MAX
,
"/sbin/%s"
,
applet
[
i
]);
snprintf
(
buf
,
PATH_MAX
,
"/sbin/%s"
,
applet
[
i
]);
xsymlink
(
"/sbin/magisk"
,
buf
);
xsymlink
(
"/sbin/magisk"
,
buf
);
...
...
native/jni/core/magisk.c
View file @
c0e2f440
...
@@ -33,8 +33,8 @@ static void usage() {
...
@@ -33,8 +33,8 @@ static void usage() {
fprintf
(
stderr
,
fprintf
(
stderr
,
"Magisk v"
xstr
(
MAGISK_VERSION
)
"("
xstr
(
MAGISK_VER_CODE
)
") (by topjohnwu) multi-call binary
\n
"
"Magisk v"
xstr
(
MAGISK_VERSION
)
"("
xstr
(
MAGISK_VER_CODE
)
") (by topjohnwu) multi-call binary
\n
"
"
\n
"
"
\n
"
"Usage:
%s
[applet [arguments]...]
\n
"
"Usage:
magisk
[applet [arguments]...]
\n
"
" or:
%s
[options]...
\n
"
" or:
magisk
[options]...
\n
"
"
\n
"
"
\n
"
"Options:
\n
"
"Options:
\n
"
" -c print current binary version
\n
"
" -c print current binary version
\n
"
...
@@ -56,8 +56,7 @@ static void usage() {
...
@@ -56,8 +56,7 @@ static void usage() {
"Supported init triggers:
\n
"
"Supported init triggers:
\n
"
" startup, post-fs-data, service
\n
"
" startup, post-fs-data, service
\n
"
"
\n
"
"
\n
"
"Supported applets:
\n
"
"Supported applets:
\n
"
);
,
argv0
,
argv0
);
for
(
int
i
=
0
;
applet
[
i
];
++
i
)
for
(
int
i
=
0
;
applet
[
i
];
++
i
)
fprintf
(
stderr
,
i
?
", %s"
:
" %s"
,
applet
[
i
]);
fprintf
(
stderr
,
i
?
", %s"
:
" %s"
,
applet
[
i
]);
...
@@ -65,11 +64,9 @@ static void usage() {
...
@@ -65,11 +64,9 @@ static void usage() {
exit
(
1
);
exit
(
1
);
}
}
int
main
(
int
argc
,
char
*
argv
[])
{
int
magisk_main
(
int
argc
,
char
*
argv
[])
{
umask
(
0
);
if
(
argc
<
2
)
argv0
=
argv
[
0
];
usage
();
if
(
strcmp
(
basename
(
argv
[
0
]),
"magisk"
)
==
0
)
{
if
(
argc
<
2
)
usage
();
if
(
strcmp
(
argv
[
1
],
"-c"
)
==
0
)
{
if
(
strcmp
(
argv
[
1
],
"-c"
)
==
0
)
{
printf
(
"%s (%d)
\n
"
,
MAGISK_VER_STR
,
MAGISK_VER_CODE
);
printf
(
"%s (%d)
\n
"
,
MAGISK_VER_STR
,
MAGISK_VER_CODE
);
return
0
;
return
0
;
...
@@ -160,7 +157,16 @@ int main(int argc, char *argv[]) {
...
@@ -160,7 +157,16 @@ int main(int argc, char *argv[]) {
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
(
0
);
write_int
(
fd
,
LATE_START
);
write_int
(
fd
,
LATE_START
);
return
read_int
(
fd
);
return
read_int
(
fd
);
}
else
{
}
usage
();
return
1
;
}
int
main
(
int
argc
,
char
*
argv
[])
{
umask
(
0
);
argv0
=
argv
[
0
];
if
(
strcmp
(
basename
(
argv0
),
"magisk.bin"
)
==
0
)
{
if
(
argc
>=
2
)
{
// It's calling applets
// It's calling applets
--
argc
;
--
argc
;
++
argv
;
++
argv
;
...
@@ -173,6 +179,6 @@ int main(int argc, char *argv[]) {
...
@@ -173,6 +179,6 @@ int main(int argc, char *argv[]) {
return
(
*
applet_main
[
i
])(
argc
,
argv
);
return
(
*
applet_main
[
i
])(
argc
,
argv
);
}
}
fprintf
(
stderr
,
"%s: applet not found
\n
"
,
basename
(
argv
[
0
]));
// Not an applet
return
1
;
return
magisk_main
(
argc
,
argv
)
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment