TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-26 01:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly detect SysUI

Browse Source
This commit is contained in:
topjohnwu 2022-10-10 21:28:04 -07:00
parent 978216eade
commit c3b4678f6e
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/src/zygisk/deny/deny.hpp
View File

@ -49,4 +49,5 @@ void ls_list(int client);
bool is_deny_target(int uid, std::string_view process); bool is_deny_target(int uid, std::string_view process);
void revert_unmount(); void revert_unmount();
extern int sys_ui_app_id;
extern std::atomic<bool> denylist_enforced; extern std::atomic<bool> denylist_enforced;

10
native/src/zygisk/deny/utils.cpp
View File

@ -27,6 +27,8 @@ static unique_ptr<map<string, set<string, StringCmp>, StringCmp>> pkg_to_procs_;
static unique_ptr<map<int, set<string_view>>> app_id_to_pkgs_; static unique_ptr<map<int, set<string_view>>> app_id_to_pkgs_;
#define app_id_to_pkgs (*app_id_to_pkgs_) #define app_id_to_pkgs (*app_id_to_pkgs_)
int sys_ui_app_id = -1;
// Locks the data structures above // Locks the data structures above
static pthread_mutex_t data_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t data_lock = PTHREAD_MUTEX_INITIALIZER;
@ -39,6 +41,10 @@ static void rescan_apps() {
app_id_to_pkgs.clear(); app_id_to_pkgs.clear();
struct stat st{};
if (xstat("/data/data/com.android.systemui", &st) == 0)
sys_ui_app_id = to_app_id(st.st_uid);
auto data_dir = xopen_dir(APP_DATA_DIR); auto data_dir = xopen_dir(APP_DATA_DIR);
if (!data_dir) if (!data_dir)
return; return;
@ -49,8 +55,8 @@ static void rescan_apps() {
if (auto dir = xopen_dir(dfd)) { if (auto dir = xopen_dir(dfd)) {
while ((entry = xreaddir(dir.get()))) { while ((entry = xreaddir(dir.get()))) {
// For each package // For each package
struct stat st{}; if (xfstatat(dfd, entry->d_name, &st, 0))
xfstatat(dfd, entry->d_name, &st, 0); continue;
int app_id = to_app_id(st.st_uid); int app_id = to_app_id(st.st_uid);
if (auto it = pkg_to_procs.find(entry->d_name); it != pkg_to_procs.end()) { if (auto it = pkg_to_procs.find(entry->d_name); it != pkg_to_procs.end()) {
app_id_to_pkgs[app_id].insert(it->first); app_id_to_pkgs[app_id].insert(it->first);

2
native/src/zygisk/entry.cpp
View File

@ -304,6 +304,8 @@ static void get_process_info(int client, const sock_cred *cred) {
int manager_app_id = get_manager(); int manager_app_id = get_manager();
if (to_app_id(uid) == manager_app_id) { if (to_app_id(uid) == manager_app_id) {
flags |= PROCESS_IS_MAGISK_APP; flags |= PROCESS_IS_MAGISK_APP;
} else if (to_app_id(uid) == sys_ui_app_id) {
flags |= PROCESS_IS_SYS_UI;
} }
if (denylist_enforced) { if (denylist_enforced) {
flags |= DENYLIST_ENFORCING; flags |= DENYLIST_ENFORCING;

2
native/src/zygisk/hook.cpp
View File

@ -165,7 +165,7 @@ DCL_HOOK_FUNC(int, unshare, int flags) {
// For some unknown reason, unmounting app_process in SysUI can break. // For some unknown reason, unmounting app_process in SysUI can break.
// This is reproducible on the official AVD running API 26 and 27. // This is reproducible on the official AVD running API 26 and 27.
// Simply avoid doing any unmounts for SysUI to avoid potential issues. // Simply avoid doing any unmounts for SysUI to avoid potential issues.
g_ctx->process && g_ctx->process != "com.android.systemui"sv) { (g_ctx->info_flags & PROCESS_IS_SYS_UI)) {
if (g_ctx->flags[DO_REVERT_UNMOUNT]) { if (g_ctx->flags[DO_REVERT_UNMOUNT]) {
revert_unmount(); revert_unmount();
} else { } else {

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

@ -108,11 +108,12 @@ 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 = (DENYLIST_ENFORCING | PROCESS_IS_MAGISK_APP) PRIVATE_MASK = (PROCESS_IS_SYS_UI | DENYLIST_ENFORCING | PROCESS_IS_MAGISK_APP)
}; };
struct api_abi_base { struct api_abi_base {