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

SAR can also have monolithic sepolicy

Browse Source
This commit is contained in:
topjohnwu 2022-03-17 22:32:49 -07:00
parent f008420891
commit 32cd694ad5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
native/jni/init/init.hpp
View File

@ -61,9 +61,6 @@ protected:
// When this boolean is set, this means we are currently // When this boolean is set, this means we are currently
// running magiskinit on legacy SAR AVD emulator // running magiskinit on legacy SAR AVD emulator
bool avd_hack = false; bool avd_hack = false;
#else
// Make it constexpr so compiler can optimize hacks out of the code
static constexpr bool avd_hack = false;
#endif #endif
void patch_sepolicy(const char *file); void patch_sepolicy(const char *file);

10
native/jni/init/rootdir.cpp
View File

@ -181,6 +181,7 @@ void SARBase::patch_ro_root() {
xmkdir(ROOTOVL, 0); xmkdir(ROOTOVL, 0);
#if ENABLE_AVD_HACK
// Handle avd hack // Handle avd hack
if (avd_hack) { if (avd_hack) {
int src = xopen("/init", O_RDONLY | O_CLOEXEC); int src = xopen("/init", O_RDONLY | O_CLOEXEC);
@ -193,6 +194,7 @@ void SARBase::patch_ro_root() {
close(src); close(src);
close(dest); close(dest);
} }
#endif
// Handle overlay.d // Handle overlay.d
restore_folder(ROOTOVL, overlays); restore_folder(ROOTOVL, overlays);
@ -233,14 +235,18 @@ void SARBase::patch_ro_root() {
} }
} }
if (access("/sepolicy", F_OK) == 0) {
patch_sepolicy(ROOTOVL "/sepolicy");
} else {
hijack_sepolicy();
}
// Mount rootdir // Mount rootdir
magic_mount(ROOTOVL); magic_mount(ROOTOVL);
int dest = xopen(ROOTMNT, O_WRONLY | O_CREAT, 0); int dest = xopen(ROOTMNT, O_WRONLY | O_CREAT, 0);
write(dest, magic_mount_list.data(), magic_mount_list.length()); write(dest, magic_mount_list.data(), magic_mount_list.length());
close(dest); close(dest);
hijack_sepolicy();
chdir("/"); chdir("/");
} }