TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-05-14 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check device tree fstab entries are compatible

Browse Source 
Fix topjohnwu#5664
This commit is contained in:
canyie 2022-04-01 13:16:23 +08:00 committed by John Wu
parent d8718d8ac8
commit 3f840f53a0
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ protected:
#endif #endif
void patch_sepolicy(const char *file); void patch_sepolicy(const char *file);
void hijack_sepolicy(); bool hijack_sepolicy();
void setup_tmp(const char *path); void setup_tmp(const char *path);
void patch_rw_root(); void patch_rw_root();
public: public:

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

@ -235,10 +235,8 @@ void SARBase::patch_ro_root() {
} }
} }
if (access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) { if ((access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) || !hijack_sepolicy()) {
patch_sepolicy(ROOTOVL "/sepolicy"); patch_sepolicy(ROOTOVL "/sepolicy");
} else {
hijack_sepolicy();
} }
// Mount rootdir // Mount rootdir
@ -309,10 +307,8 @@ void MagiskInit::patch_rw_root() {
} }
} }
if (!treble && access("/sepolicy", F_OK) == 0) { if ((!treble && access("/sepolicy", F_OK) == 0) || !hijack_sepolicy()) {
patch_sepolicy("/sepolicy"); patch_sepolicy("/sepolicy");
} else {
hijack_sepolicy();
} }
chdir("/"); chdir("/");

22
native/jni/init/selinux.cpp
View File

@ -42,7 +42,7 @@ void MagiskInit::patch_sepolicy(const char *file) {
#define MOCK_BLOCKING SELINUXMOCK "/blocking" #define MOCK_BLOCKING SELINUXMOCK "/blocking"
#define REAL_SELINUXFS SELINUXMOCK "/fs" #define REAL_SELINUXFS SELINUXMOCK "/fs"
void MagiskInit::hijack_sepolicy() { bool MagiskInit::hijack_sepolicy() {
const char *blocking_target; const char *blocking_target;
string actual_content; string actual_content;
@ -60,7 +60,7 @@ void MagiskInit::hijack_sepolicy() {
} else { } else {
// Error, should never happen // Error, should never happen
LOGE("! Cannot find plat_file_contexts\n"); LOGE("! Cannot find plat_file_contexts\n");
return; return false;
} }
actual_content = full_read(blocking_target); actual_content = full_read(blocking_target);
@ -91,11 +91,6 @@ void MagiskInit::hijack_sepolicy() {
// and let the original init mount selinuxfs for us // and let the original init mount selinuxfs for us
// This only happens on Android 8.0 - 9.0 // This only happens on Android 8.0 - 9.0
// Preserve sysfs and procfs for hijacking
mount_list.erase(std::remove_if(
mount_list.begin(), mount_list.end(),
[](const string &s) { return s == "/proc" || s == "/sys"; }), mount_list.end());
// Remount procfs with proper options // Remount procfs with proper options
xmount(nullptr, "/proc", nullptr, MS_REMOUNT, "hidepid=2,gid=3009"); xmount(nullptr, "/proc", nullptr, MS_REMOUNT, "hidepid=2,gid=3009");
@ -103,7 +98,18 @@ void MagiskInit::hijack_sepolicy() {
snprintf(buf, sizeof(buf), "%s/fstab/compatible", config->dt_dir); snprintf(buf, sizeof(buf), "%s/fstab/compatible", config->dt_dir);
dt_compat = full_read(buf); dt_compat = full_read(buf);
if (dt_compat.empty()) {
// Device does not do early mount and apparently use monolithic policy
return false;
}
LOGD("Hijack [%s]\n", buf); LOGD("Hijack [%s]\n", buf);
// Preserve sysfs and procfs for hijacking
mount_list.erase(std::remove_if(
mount_list.begin(), mount_list.end(),
[](const string &s) { return s == "/proc" || s == "/sys"; }), mount_list.end());
mkfifo(MOCK_COMPAT, 0444); mkfifo(MOCK_COMPAT, 0444);
xmount(MOCK_COMPAT, buf, nullptr, MS_BIND, nullptr); xmount(MOCK_COMPAT, buf, nullptr, MS_BIND, nullptr);
} else { } else {
@ -128,7 +134,7 @@ void MagiskInit::hijack_sepolicy() {
// Create a new process waiting for init operations // Create a new process waiting for init operations
if (xfork()) { if (xfork()) {
// In parent, return and continue boot process // In parent, return and continue boot process
return; return true;
} }
if (!dt_compat.empty()) { if (!dt_compat.empty()) {