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
2bc30e5c
Commit
2bc30e5c
authored
Oct 28, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide /magisk
parent
7244c02a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
bootstages.c
jni/daemon/bootstages.c
+4
-2
magisk.h
jni/include/magisk.h
+7
-5
proc_monitor.c
jni/magiskhide/proc_monitor.c
+6
-0
No files found.
jni/daemon/bootstages.c
View file @
2bc30e5c
...
@@ -415,7 +415,7 @@ static void daemon_init() {
...
@@ -415,7 +415,7 @@ static void daemon_init() {
unlinkat
(
sbin
,
entry
->
d_name
,
0
);
unlinkat
(
sbin
,
entry
->
d_name
,
0
);
}
}
close
(
sbin
);
close
(
sbin
);
mount
(
"tmpfs"
,
"/sbin"
,
"tmpfs"
,
0
,
NULL
);
x
mount
(
"tmpfs"
,
"/sbin"
,
"tmpfs"
,
0
,
NULL
);
sbin
=
xopen
(
"/sbin"
,
O_RDONLY
|
O_CLOEXEC
);
sbin
=
xopen
(
"/sbin"
,
O_RDONLY
|
O_CLOEXEC
);
fchmod
(
sbin
,
0755
);
fchmod
(
sbin
,
0755
);
fsetfilecon
(
sbin
,
"u:object_r:rootfs:s0"
);
fsetfilecon
(
sbin
,
"u:object_r:rootfs:s0"
);
...
@@ -430,7 +430,9 @@ static void daemon_init() {
...
@@ -430,7 +430,9 @@ static void daemon_init() {
snprintf
(
buf2
,
PATH_MAX
,
"/sbin/%s"
,
applet
[
i
]);
snprintf
(
buf2
,
PATH_MAX
,
"/sbin/%s"
,
applet
[
i
]);
xsymlink
(
"/root/magisk"
,
buf2
);
xsymlink
(
"/root/magisk"
,
buf2
);
}
}
xmkdir
(
"/magisk"
,
0755
);
xsymlink
(
MOUNTPOINT
,
FAKEPOINT
);
close
(
root
);
close
(
sbin
);
xmount
(
NULL
,
"/"
,
NULL
,
MS_REMOUNT
|
MS_RDONLY
,
NULL
);
xmount
(
NULL
,
"/"
,
NULL
,
MS_REMOUNT
|
MS_RDONLY
,
NULL
);
LOGI
(
"* Mounting mirrors"
);
LOGI
(
"* Mounting mirrors"
);
...
...
jni/include/magisk.h
View file @
2bc30e5c
...
@@ -22,17 +22,19 @@
...
@@ -22,17 +22,19 @@
#define UNBLOCKFILE "/dev/.magisk.unblock"
#define UNBLOCKFILE "/dev/.magisk.unblock"
#define DISABLEFILE "/cache/.disable_magisk"
#define DISABLEFILE "/cache/.disable_magisk"
#define UNINSTALLER "/cache/magisk_uninstaller.sh"
#define UNINSTALLER "/cache/magisk_uninstaller.sh"
#define MOUNTPOINT "/magisk"
#define CACHEMOUNT "/cache/magisk_mount"
#define MAGISKTMP "/dev/magisk"
#define MIRRDIR MAGISKTMP "/mirror"
#define BBPATH MAGISKTMP "/bin"
#define MOUNTPOINT MAGISKTMP "/img"
#define FAKEPOINT "/magisk"
#define COREDIR MOUNTPOINT "/.core"
#define COREDIR MOUNTPOINT "/.core"
#define HOSTSFILE COREDIR "/hosts"
#define HOSTSFILE COREDIR "/hosts"
#define HIDELIST COREDIR "/hidelist"
#define HIDELIST COREDIR "/hidelist"
#define MAINIMG "/data/magisk.img"
#define MAINIMG "/data/magisk.img"
#define DATABIN "/data/magisk"
#define DATABIN "/data/magisk"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MAGISKTMP "/dev/magisk"
#define MIRRDIR MAGISKTMP "/mirror"
#define BBPATH MAGISKTMP "/bin"
#define CACHEMOUNT "/cache/magisk_mount"
#define SELINUX_PATH "/sys/fs/selinux/"
#define SELINUX_PATH "/sys/fs/selinux/"
#define SELINUX_ENFORCE SELINUX_PATH "enforce"
#define SELINUX_ENFORCE SELINUX_PATH "enforce"
...
...
jni/magiskhide/proc_monitor.c
View file @
2bc30e5c
...
@@ -125,11 +125,17 @@ static void hide_daemon(int pid) {
...
@@ -125,11 +125,17 @@ static void hide_daemon(int pid) {
free
(
line
);
free
(
line
);
}
}
xmount
(
NULL
,
"/"
,
NULL
,
MS_REMOUNT
,
NULL
);
unlink
(
FAKEPOINT
);
exit:
exit:
// Send resume signal
// Send resume signal
kill
(
pid
,
SIGCONT
);
kill
(
pid
,
SIGCONT
);
// Free up memory
// Free up memory
vec_destroy
(
&
mount_list
);
vec_destroy
(
&
mount_list
);
// Wait a while and link it back
sleep
(
10
);
xsymlink
(
MOUNTPOINT
,
FAKEPOINT
);
_exit
(
0
);
_exit
(
0
);
}
}
...
...
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