MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only use SELinux if necessary in init

Browse Source
This commit is contained in:
topjohnwu 2019-03-09 05:30:42 -05:00
parent f24a5dfd45
commit 70efddb90f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/jni/core/init.cpp
View File

@ -407,15 +407,9 @@ static void setup_overlay() {
// Wait for early-init start // Wait for early-init start
while (access(EARLYINIT, F_OK) != 0) while (access(EARLYINIT, F_OK) != 0)
usleep(10); usleep(10);
selinux_builtin_impl();
setcon("u:r:" SEPOL_PROC_DOMAIN ":s0"); setcon("u:r:" SEPOL_PROC_DOMAIN ":s0");
unlink(EARLYINIT); unlink(EARLYINIT);
fd = open("/dev/null", O_RDWR);
xdup2(fd, STDIN_FILENO);
xdup2(fd, STDOUT_FILENO);
xdup2(fd, STDERR_FILENO);
// Mount the /sbin tmpfs overlay // Mount the /sbin tmpfs overlay
xmount("tmpfs", "/sbin", "tmpfs", 0, nullptr); xmount("tmpfs", "/sbin", "tmpfs", 0, nullptr);
chmod("/sbin", 0755); chmod("/sbin", 0755);
@ -423,10 +417,10 @@ static void setup_overlay() {
// Dump binaries // Dump binaries
mkdir(MAGISKTMP, 0755); mkdir(MAGISKTMP, 0755);
fd = open(MAGISKTMP "/config", O_WRONLY | O_CREAT, 0000); fd = xopen(MAGISKTMP "/config", O_WRONLY | O_CREAT, 0000);
write(fd, config, config_sz); write(fd, config, config_sz);
close(fd); close(fd);
fd = open("/sbin/magiskinit", O_WRONLY | O_CREAT, 0755); fd = xopen("/sbin/magiskinit", O_WRONLY | O_CREAT, 0755);
write(fd, self, self_sz); write(fd, self, self_sz);
close(fd); close(fd);
dump_magisk("/sbin/magisk", 0755); dump_magisk("/sbin/magisk", 0755);
@ -475,6 +469,7 @@ static void exec_init(char *argv[]) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
umask(0); umask(0);
no_logging();
for (int i = 0; init_applet[i]; ++i) { for (int i = 0; init_applet[i]; ++i) {
if (strcmp(basename(argv[0]), init_applet[i]) == 0) if (strcmp(basename(argv[0]), init_applet[i]) == 0)
@ -593,7 +588,8 @@ int main(int argc, char *argv[]) {
link_dir(sbin, root); link_dir(sbin, root);
setup_init_rc(); setup_init_rc();
patch_sepolicy(); if (patch_sepolicy())
selinux_builtin_impl();
// Close all file descriptors // Close all file descriptors
for (int i = 0; i < 30; ++i) for (int i = 0; i < 30; ++i)