TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-18 05:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use app_dir to detect systemui instead

Browse Source 
uid may be shared by other apps (e.g., in MIUI, systemui's uid
is 1000 and shared by many system apps).
This commit is contained in:
LoveSy 2023-03-17 10:01:22 +08:00 committed by John Wu
parent e893c13cf1
commit 07c22ccd39
4 changed files with 7 additions and 7 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,5 +49,4 @@ 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;

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

@ -27,8 +27,6 @@ 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;
@ -58,8 +56,6 @@ static void rescan_apps() {
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);
} }
if (entry->d_name == "com.android.systemui"sv)
sys_ui_app_id = app_id;
} }
} else { } else {
close(dfd); close(dfd);

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

@ -306,8 +306,6 @@ 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;

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

@ -604,6 +604,13 @@ void HookContext::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] = true; flags[DO_REVERT_UNMOUNT] = true;