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

Match app_zygote by context

Browse Source
This commit is contained in:
vvb2060 2022-07-23 00:59:50 +08:00 committed by John Wu
parent 1a964e78dd
commit d35072d4e6
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
native/jni/zygisk/deny/utils.cpp
View File

@ -104,27 +104,39 @@ static void crawl_procfs(const F &fn) {
} }
} }
template <bool str_op(string_view, string_view)> static inline bool str_eql(string_view a, string_view b) { return a == b; }
static bool proc_name_match(int pid, const char *name) {
template<bool str_op(string_view, string_view) = &str_eql>
static bool proc_name_match(int pid, string_view name) {
char buf[4019]; char buf[4019];
sprintf(buf, "/proc/%d/cmdline", pid); sprintf(buf, "/proc/%d/cmdline", pid);
if (auto fp = open_file(buf, "re")) { if (auto fp = open_file(buf, "re")) {
fgets(buf, sizeof(buf), fp.get()); fgets(buf, sizeof(buf), fp.get());
if (str_op(buf, name)) { if (str_op(buf, name)) {
LOGD("denylist: kill PID=[%d] (%s)\n", pid, buf);
return true; return true;
} }
} }
return false; return false;
} }
static inline bool str_eql(string_view a, string_view b) { return a == b; } static bool proc_context_match(int pid, string_view context) {
char buf[PATH_MAX];
sprintf(buf, "/proc/%d/attr/current", pid);
if (auto fp = open_file(buf, "re")) {
fgets(buf, sizeof(buf), fp.get());
if (str_eql(buf, context)) {
return true;
}
}
return false;
}
template<bool str_op(string_view, string_view) = &str_eql> template<bool matcher(int, string_view) = &proc_name_match>
static void kill_process(const char *name, bool multi = false) { static void kill_process(const char *name, bool multi = false) {
crawl_procfs([=](int pid) -> bool { crawl_procfs([=](int pid) -> bool {
if (proc_name_match<str_op>(pid, name)) { if (matcher(pid, name)) {
kill(pid, SIGKILL); kill(pid, SIGKILL);
LOGD("denylist: kill PID=[%d] (%s)\n", pid, name);
return multi; return multi;
} }
return true; return true;
@ -176,7 +188,7 @@ static auto add_hide_set(const char *pkg, const char *proc) {
return p; return p;
if (str_eql(pkg, ISOLATED_MAGIC)) { if (str_eql(pkg, ISOLATED_MAGIC)) {
// Kill all matching isolated processes // Kill all matching isolated processes
kill_process<&str_starts>(proc, true); kill_process<&proc_name_match<str_starts>>(proc, true);
} else { } else {
kill_process(proc); kill_process(proc);
} }
@ -312,13 +324,6 @@ void ls_list(int client) {
close(client); close(client);
} }
static bool str_ends_safe(string_view s, string_view ss) {
// Never kill webview zygote
if (s == "webview_zygote")
return false;
return str_ends(s, ss);
}
static void update_deny_config() { static void update_deny_config() {
char sql[64]; char sql[64];
sprintf(sql, "REPLACE INTO settings (key,value) VALUES('%s',%d)", sprintf(sql, "REPLACE INTO settings (key,value) VALUES('%s',%d)",
@ -354,7 +359,7 @@ int enable_deny() {
if (SDK_INT >= 29 && zygisk_enabled) { if (SDK_INT >= 29 && zygisk_enabled) {
kill_process("usap32", true); kill_process("usap32", true);
kill_process("usap64", true); kill_process("usap64", true);
kill_process<&str_ends_safe>("_zygote", true); kill_process<&proc_context_match>("app_zygote", true);
} }
} }