TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 19:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check path when start daemon

Browse Source
This commit is contained in:
vvb2060 2022-05-29 14:28:56 +08:00 committed by topjohnwu
parent c0981174a8
commit d19fcd5e21
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/core/daemon.cpp
View File

@ -416,6 +416,14 @@ int connect_daemon(int req, bool create) {
return -1; return -1;
} }
char buf[64];
xreadlink("/proc/self/exe", buf, sizeof(buf));
if (str_starts(buf, "/system/bin/")) {
LOGE("Start daemon on /dev or /sbin\n");
close(fd);
return -1;
}
if (fork_dont_care() == 0) { if (fork_dont_care() == 0) {
close(fd); close(fd);
daemon_entry(); daemon_entry();

7
native/jni/core/restorecon.cpp
View File

@ -76,13 +76,6 @@ void restorecon() {
} }
void restore_tmpcon() { void restore_tmpcon() {
if (MAGISKTMP == "/system/bin") {
// Running with emulator.sh
if (SDK_INT >= 26)
lsetfilecon("/system/bin/magisk", EXEC_CON);
return;
}
if (MAGISKTMP == "/sbin") if (MAGISKTMP == "/sbin")
setfilecon(MAGISKTMP.data(), ROOT_CON); setfilecon(MAGISKTMP.data(), ROOT_CON);
else else