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

Remove Q dirty hacks in SARCompat

Browse Source
This commit is contained in:
topjohnwu 2019-06-24 01:31:42 -07:00
parent a1a1ac0bbb
commit 6cde695194
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/init/early_mount.cpp
View File

@ -135,14 +135,6 @@ void SARCompatInit::early_mount() {
xmkdir("/system", 0755); xmkdir("/system", 0755);
xmount("/system_root/system", "/system", nullptr, MS_BIND, nullptr); xmount("/system_root/system", "/system", nullptr, MS_BIND, nullptr);
// Android Q
if (is_lnk("/system_root/init"))
load_sepol = true;
// System-as-root with monolithic sepolicy
if (access("/system_root/sepolicy", F_OK) == 0)
cp_afc("/system_root/sepolicy", "/sepolicy");
link_root("/vendor"); link_root("/vendor");
link_root("/product"); link_root("/product");
link_root("/odm"); link_root("/odm");

1
native/jni/init/init.h
View File

@ -27,7 +27,6 @@ class MagiskInit : public BaseInit {
protected: protected:
raw_data self{}; raw_data self{};
int root = -1; int root = -1;
bool load_sepol = false;
bool mnt_system = false; bool mnt_system = false;
bool mnt_vendor = false; bool mnt_vendor = false;
bool mnt_product = false; bool mnt_product = false;

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

@ -40,8 +40,6 @@ constexpr const char wrapper[] =
; ;
void RootFSInit::setup_rootfs() { void RootFSInit::setup_rootfs() {
bool patch_init = patch_sepolicy();
if (cmd->system_as_root) { if (cmd->system_as_root) {
// Clone rootfs // Clone rootfs
LOGD("Clone root dir from system to rootfs\n"); LOGD("Clone root dir from system to rootfs\n");
@ -50,7 +48,7 @@ void RootFSInit::setup_rootfs() {
close(system_root); close(system_root);
} }
if (patch_init) { if (patch_sepolicy()) {
constexpr char SYSTEM_INIT[] = "/system/bin/init"; constexpr char SYSTEM_INIT[] = "/system/bin/init";
// If init is symlink, copy it to rootfs so we can patch // If init is symlink, copy it to rootfs so we can patch
if (is_lnk("/init")) if (is_lnk("/init"))
@ -157,21 +155,12 @@ bool MagiskInit::patch_sepolicy() {
sepol_allow(SEPOL_PROC_DOMAIN, ALL, ALL, ALL); sepol_allow(SEPOL_PROC_DOMAIN, ALL, ALL, ALL);
dump_policydb("/sepolicy"); dump_policydb("/sepolicy");
// Load policy to kernel so we can label rootfs
if (load_sepol) {
LOGD("sepol: preload sepolicy\n");
dump_policydb(SELINUX_LOAD);
}
// Remove OnePlus stupid debug sepolicy and use our own // Remove OnePlus stupid debug sepolicy and use our own
if (access("/sepolicy_debug", F_OK) == 0) { if (access("/sepolicy_debug", F_OK) == 0) {
unlink("/sepolicy_debug"); unlink("/sepolicy_debug");
link("/sepolicy", "/sepolicy_debug"); link("/sepolicy", "/sepolicy_debug");
} }
// Enable selinux functions
selinux_builtin_impl();
return patch_init; return patch_init;
} }