TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-17 15:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in compiling split cil

Browse Source
This commit is contained in:
topjohnwu 2017-12-01 03:33:25 +08:00
parent e989195a68
commit a30777bd9f
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
jni/core/magiskinit.c
View File

@ -177,8 +177,8 @@ static void patch_ramdisk() {
size_t size; size_t size;
mmap_rw("/init", &addr, &size); mmap_rw("/init", &addr, &size);
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
if (memcmp(addr + i, "/system/etc/selinux/plat_sepolicy.cil", 37) == 0) { if (memcmp(addr + i, SPLIT_PLAT_CIL, sizeof(SPLIT_PLAT_CIL) - 1) == 0) {
memcpy(addr + i, "/system/etc/selinux/plat_sepolicy.xxx", 37); memcpy(addr + i + sizeof(SPLIT_PLAT_CIL) - 4, "xxx", 3);
break; break;
} }
} }
@ -218,29 +218,31 @@ static int compile_cil() {
cil_set_attrs_expand_generated(db, 0); cil_set_attrs_expand_generated(db, 0);
// plat // plat
mmap_ro("/system/etc/selinux/plat_sepolicy.cil", &addr, &size); mmap_ro(SPLIT_PLAT_CIL, &addr, &size);
cil_add_file(db, "/system/etc/selinux/plat_sepolicy.cil", addr, size); VLOG("cil_add[%s]\n", SPLIT_PLAT_CIL);
cil_add_file(db, SPLIT_PLAT_CIL, addr, size);
munmap(addr, size); munmap(addr, size);
// mapping // mapping
char plat[10]; char plat[10];
int fd = open("/vendor/etc/selinux/plat_sepolicy_vers.txt", O_RDONLY | O_CLOEXEC); int fd = open(SPLIT_NONPLAT_VER, O_RDONLY | O_CLOEXEC);
if (fd > 0) { plat[read(fd, plat, sizeof(plat)) - 1] = '\0';
plat[read(fd, plat, sizeof(plat)) - 1] = '\0'; snprintf(path, sizeof(path), SPLIT_PLAT_MAPPING, plat);
snprintf(path, sizeof(path), "/system/etc/selinux/mapping/%s.cil", plat); mmap_ro(path, &addr, &size);
mmap_ro(path, &addr, &size); VLOG("cil_add[%s]\n", path);
cil_add_file(db, path, addr, size); cil_add_file(db, path, addr, size);
munmap(addr, size); munmap(addr, size);
close(fd); close(fd);
}
dir = opendir("/vendor/etc/selinux"); // nonplat
dir = opendir(NONPLAT_POLICY_DIR);
while ((entry = readdir(dir))) { while ((entry = readdir(dir))) {
if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
continue; continue;
if (strend(entry->d_name, ".cil") == 0) { if (strend(entry->d_name, ".cil") == 0) {
snprintf(path, sizeof(path), "/vendor/etc/selinux/%s", entry->d_name); snprintf(path, sizeof(path), NONPLAT_POLICY_DIR "%s", entry->d_name);
mmap_ro(path, &addr, &size); mmap_ro(path, &addr, &size);
VLOG("cil_add[%s]\n", path);
cil_add_file(db, path, addr, size); cil_add_file(db, path, addr, size);
munmap(addr, size); munmap(addr, size);
} }
@ -262,42 +264,45 @@ static int verify_precompiled() {
int fd; int fd;
char sys_sha[70], ven_sha[70]; char sys_sha[70], ven_sha[70];
dir = opendir("/vendor/etc/selinux"); // init the strings with different value
sys_sha[0] = 0;
ven_sha[0] = 1;
dir = opendir(NONPLAT_POLICY_DIR);
while ((entry = readdir(dir))) { while ((entry = readdir(dir))) {
if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
continue; continue;
if (strend(entry->d_name, ".sha256") == 0) { if (strend(entry->d_name, ".sha256") == 0) {
fd = openat(dirfd(dir), entry->d_name, O_RDONLY | O_CLOEXEC); fd = openat(dirfd(dir), entry->d_name, O_RDONLY | O_CLOEXEC);
ven_sha[read(fd, ven_sha, sizeof(ven_sha))] = '\0'; ven_sha[read(fd, ven_sha, sizeof(ven_sha)) - 1] = '\0';
close(fd); close(fd);
break; break;
} }
} }
closedir(dir); closedir(dir);
dir = opendir("/system/etc/selinux"); dir = opendir(PLAT_POLICY_DIR);
while ((entry = readdir(dir))) { while ((entry = readdir(dir))) {
if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
continue; continue;
if (strend(entry->d_name, ".sha256") == 0) { if (strend(entry->d_name, ".sha256") == 0) {
fd = openat(dirfd(dir), entry->d_name, O_RDONLY | O_CLOEXEC); fd = openat(dirfd(dir), entry->d_name, O_RDONLY | O_CLOEXEC);
sys_sha[read(fd, sys_sha, sizeof(sys_sha))] = '\0'; sys_sha[read(fd, sys_sha, sizeof(sys_sha)) - 1] = '\0';
close(fd); close(fd);
break; break;
} }
} }
closedir(dir); closedir(dir);
return strcmp(sys_sha, ven_sha); VLOG("sys_sha[%s]\nven_sha[%s]\n", sys_sha, ven_sha);
return strcmp(sys_sha, ven_sha) == 0;
} }
static void patch_sepolicy() { static void patch_sepolicy() {
if (access("/sepolicy", R_OK) == 0) { if (access("/sepolicy", R_OK) == 0)
load_policydb("/sepolicy"); load_policydb("/sepolicy");
} else if (access("/vendor/etc/selinux/precompiled_sepolicy", R_OK) == 0 else if (access(SPLIT_PRECOMPILE, R_OK) == 0 && verify_precompiled())
&& verify_precompiled() == 0) { load_policydb(SPLIT_PRECOMPILE);
load_policydb("/vendor/etc/selinux/precompiled_sepolicy"); else if (access(SPLIT_PLAT_CIL, R_OK) == 0)
} else if (access("/system/etc/selinux/plat_sepolicy.cil", R_OK) == 0) {
compile_cil(); compile_cil();
}
sepol_magisk_rules(); sepol_magisk_rules();
dump_policydb("/sepolicy"); dump_policydb("/sepolicy");

9
jni/include/magisk.h
View File

@ -35,11 +35,20 @@
#define MAGISKRC "/init.magisk.rc" #define MAGISKRC "/init.magisk.rc"
// selinuxfs paths
#define SELINUX_PATH "/sys/fs/selinux/" #define SELINUX_PATH "/sys/fs/selinux/"
#define SELINUX_ENFORCE SELINUX_PATH "enforce" #define SELINUX_ENFORCE SELINUX_PATH "enforce"
#define SELINUX_POLICY SELINUX_PATH "policy" #define SELINUX_POLICY SELINUX_PATH "policy"
#define SELINUX_LOAD SELINUX_PATH "load" #define SELINUX_LOAD SELINUX_PATH "load"
// split policy paths
#define PLAT_POLICY_DIR "/system/etc/selinux/"
#define NONPLAT_POLICY_DIR "/vendor/etc/selinux/"
#define SPLIT_PLAT_CIL PLAT_POLICY_DIR "plat_sepolicy.cil"
#define SPLIT_PLAT_MAPPING PLAT_POLICY_DIR "mapping/%s.cil"
#define SPLIT_PRECOMPILE NONPLAT_POLICY_DIR "precompiled_sepolicy"
#define SPLIT_NONPLAT_VER NONPLAT_POLICY_DIR "plat_sepolicy_vers.txt"
#define MAGISKHIDE_PROP "persist.magisk.hide" #define MAGISKHIDE_PROP "persist.magisk.hide"
extern char *argv0; /* For changing process name */ extern char *argv0; /* For changing process name */