TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid doing any unmounts for SysUI"

Browse Source
This commit is contained in:
vvb2060 2022-09-02 17:09:49 +08:00 committed by John Wu
parent 6cda6c2fae
commit 00e9d76a5a
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/src/core/zygisk/hook.cpp
View File

@ -145,11 +145,7 @@ DCL_HOOK_FUNC(int, fork) {
// Unmount stuffs in the process's private mount namespace // Unmount stuffs in the process's private mount namespace
DCL_HOOK_FUNC(static int, unshare, int flags) { DCL_HOOK_FUNC(static int, unshare, int flags) {
int res = old_unshare(flags); int res = old_unshare(flags);
if (g_ctx && (flags & CLONE_NEWNS) != 0 && res == 0 && if (g_ctx && (flags & CLONE_NEWNS) != 0 && res == 0) {
// For some unknown reason, unmounting app_process in SysUI can break.
// This is reproducible on the official AVD running API 26 and 27.
// Simply avoid doing any unmounts for SysUI to avoid potential issues.
(g_ctx->info_flags & PROCESS_IS_SYS_UI) == 0) {
if (g_ctx->flags & DO_REVERT_UNMOUNT) { if (g_ctx->flags & DO_REVERT_UNMOUNT) {
revert_unmount(); revert_unmount();
} }

7
native/src/core/zygisk/module.cpp
View File

@ -365,13 +365,6 @@ void ZygiskContext::app_specialize_pre() {
vector<int> module_fds; vector<int> module_fds;
int fd = remote_get_info(args.app->uid, process, &info_flags, module_fds); int fd = remote_get_info(args.app->uid, process, &info_flags, module_fds);
if (args.app->app_data_dir) {
const auto *app_data_dir = env->GetStringUTFChars(args.app->app_data_dir, nullptr);
if (std::string_view(app_data_dir).ends_with("/com.android.systemui")) {
info_flags |= PROCESS_IS_SYS_UI;
}
env->ReleaseStringUTFChars(args.app->app_data_dir, app_data_dir);
}
if ((info_flags & UNMOUNT_MASK) == UNMOUNT_MASK) { if ((info_flags & UNMOUNT_MASK) == UNMOUNT_MASK) {
ZLOGI("[%s] is on the denylist\n", process); ZLOGI("[%s] is on the denylist\n", process);
flags |= DO_REVERT_UNMOUNT; flags |= DO_REVERT_UNMOUNT;

3
native/src/core/zygisk/module.hpp
View File

@ -126,12 +126,11 @@ enum : uint32_t {
PROCESS_GRANTED_ROOT = zygisk::StateFlag::PROCESS_GRANTED_ROOT, PROCESS_GRANTED_ROOT = zygisk::StateFlag::PROCESS_GRANTED_ROOT,
PROCESS_ON_DENYLIST = zygisk::StateFlag::PROCESS_ON_DENYLIST, PROCESS_ON_DENYLIST = zygisk::StateFlag::PROCESS_ON_DENYLIST,
PROCESS_IS_SYS_UI = (1u << 29),
DENYLIST_ENFORCING = (1u << 30), DENYLIST_ENFORCING = (1u << 30),
PROCESS_IS_MAGISK_APP = (1u << 31), PROCESS_IS_MAGISK_APP = (1u << 31),
UNMOUNT_MASK = (PROCESS_ON_DENYLIST | DENYLIST_ENFORCING), UNMOUNT_MASK = (PROCESS_ON_DENYLIST | DENYLIST_ENFORCING),
PRIVATE_MASK = (PROCESS_IS_SYS_UI | DENYLIST_ENFORCING | PROCESS_IS_MAGISK_APP) PRIVATE_MASK = (DENYLIST_ENFORCING | PROCESS_IS_MAGISK_APP)
}; };
struct api_abi_base { struct api_abi_base {