TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-31 22:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update data structure

Browse Source
This commit is contained in:
topjohnwu
2022-02-07 00:17:07 -08:00
parent e9348d9b6a
commit 3145e67feb
3 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
native/jni/utils/misc.hpp
View File

@@ -80,13 +80,18 @@ public:
bool operator!=(const stateless_allocator&) { return false; }
};
class dynamic_bitset {
class dynamic_bitset_impl {
public:
using slot_type = unsigned long;
constexpr static int slot_size = sizeof(slot_type) * 8;
using slot_bits = std::bitset<slot_size>;
slot_bits::reference operator[] (size_t pos) {
size_t slots() const { return slot_list.size(); }
slot_type get_slot(size_t slot) const {
return slot_list.size() > slot ? slot_list[slot].to_ulong() : 0ul;
}
protected:
slot_bits::reference get(size_t pos) {
size_t slot = pos / slot_size;
size_t index = pos % slot_size;
if (slot_list.size() <= slot) {
@@ -94,19 +99,25 @@ public:
}
return slot_list[slot][index];
}
bool operator[] (size_t pos) const {
bool get(size_t pos) const {
size_t slot = pos / slot_size;
size_t index = pos % slot_size;
return slot_list.size() > slot && slot_list[slot][index];
}
size_t slots() const { return slot_list.size(); }
slot_type get_slot(size_t slot) const {
return slot_list.size() > slot ? slot_list[slot].to_ulong() : 0ul;
}
private:
std::vector<slot_bits> slot_list;
};
struct dynamic_bitset : public dynamic_bitset_impl {
slot_bits::reference operator[] (size_t pos) { return get(pos); }
bool operator[] (size_t pos) const { return get(pos); }
};
struct StringCmp {
using is_transparent = void;
bool operator()(std::string_view a, std::string_view b) const { return a < b; }
};
int parse_int(std::string_view s);
using thread_entry = void *(*)(void *);

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

@@ -14,8 +14,13 @@
using namespace std;
static set<pair<string, string>> *deny_set; /* set of <pkg, process> pair */
static map<int, vector<string_view>> *app_id_proc_map; /* app ID -> list of process */
// Package name -> list of process names
using str_set = set<string, StringCmp>;
static map<string, str_set, StringCmp> *deny_map_;
#define deny_map (*deny_map_)
// app ID -> list of process name
static map<int, vector<string_view>> *app_id_proc_map;
static int inotify_fd = -1;
// Locks the variables above
@@ -40,29 +45,28 @@ static void rebuild_map() {
return;
}
string_view prev_pkg;
struct stat st;
for (const auto &target : *deny_set) {
if (target.first == ISOLATED_MAGIC) {
// Isolated process
(*app_id_proc_map)[-1].emplace_back(target.second);
} else if (prev_pkg == target.first) {
// Optimize the case when it's the same package as previous iteration
(*app_id_proc_map)[to_app_id(st.st_uid)].emplace_back(target.second);
} else {
for (const auto &[pkg, procs] : deny_map) {
int app_id = -1;
if (pkg != ISOLATED_MAGIC) {
// Traverse the filesystem to find app ID
for (const auto &user_id : users) {
data_path.resize(len);
data_path += '/';
data_path += user_id;
data_path += '/';
data_path += target.first;
if (stat(data_path.data(), &st) == 0) {
prev_pkg = target.first;
(*app_id_proc_map)[to_app_id(st.st_uid)].emplace_back(target.second);
data_path += pkg;
struct stat st{};
if (stat(data_path.data(), &st) != 0) {
app_id = to_app_id(st.st_uid);
break;
}
}
if (app_id < 0)
continue;
}
for (const auto &proc : procs) {
(*app_id_proc_map)[app_id].emplace_back(proc);
}
}
}
@@ -145,23 +149,26 @@ static bool validate(const char *pkg, const char *proc) {
return pkg_valid && proc_valid;
}
static void add_hide_set(const char *pkg, const char *proc) {
static bool add_hide_set(const char *pkg, const char *proc) {
auto p = deny_map[pkg].emplace(proc);
if (!p.second)
return false;
LOGI("denylist add: [%s/%s]\n", pkg, proc);
deny_set->emplace(pkg, proc);
if (!do_kill)
return;
return true;
if (str_eql(pkg, ISOLATED_MAGIC)) {
// Kill all matching isolated processes
kill_process<&str_starts>(proc, true);
} else {
kill_process(proc);
}
return true;
}
static void clear_data() {
delete deny_set;
delete deny_map_;
delete app_id_proc_map;
deny_set = nullptr;
deny_map_ = nullptr;
app_id_proc_map = nullptr;
unregister_poll(inotify_fd, true);
inotify_fd = -1;
@@ -188,7 +195,7 @@ static bool ensure_data() {
LOGI("denylist: initializing internal data structures\n");
default_new(deny_set);
default_new(deny_map_);
char *err = db_exec("SELECT * FROM denylist", [](db_row &row) -> bool {
add_hide_set(row["package_name"].data(), row["process"].data());
return true;
@@ -226,11 +233,8 @@ static int add_list(const char *pkg, const char *proc) {
mutex_guard lock(data_lock);
if (!ensure_data())
return DAEMON_ERROR;
for (const auto &hide : *deny_set)
if (hide.first == pkg && hide.second == proc)
return DENYLIST_ITEM_EXIST;
add_hide_set(pkg, proc);
if (!add_hide_set(pkg, proc))
return DENYLIST_ITEM_EXIST;
rebuild_map();
}
@@ -256,13 +260,19 @@ static int rm_list(const char *pkg, const char *proc) {
return DAEMON_ERROR;
bool remove = false;
for (auto it = deny_set->begin(); it != deny_set->end();) {
if (it->first == pkg && (proc[0] == '\0' || it->second == proc)) {
if (proc[0] == '\0') {
if (deny_map.erase(pkg) != 0) {
remove = true;
LOGI("denylist rm: [%s/%s]\n", it->first.data(), it->second.data());
it = deny_set->erase(it);
} else {
++it;
LOGI("denylist rm: [%s]\n", pkg);
}
} else {
auto it = deny_map.find(pkg);
if (it != deny_map.end()) {
if (it->second.erase(proc) != 0) {
remove = true;
LOGI("denylist rm: [%s/%s]\n", pkg, proc);
}
}
}
if (!remove)
@@ -296,11 +306,14 @@ void ls_list(int client) {
}
write_int(client, DAEMON_SUCCESS);
for (const auto &hide : *deny_set) {
write_int(client, hide.first.size() + hide.second.size() + 1);
xwrite(client, hide.first.data(), hide.first.size());
xwrite(client, "|", 1);
xwrite(client, hide.second.data(), hide.second.size());
for (const auto &[pkg, procs] : deny_map) {
for (const auto &proc : procs) {
write_int(client, pkg.size() + proc.size() + 1);
xwrite(client, pkg.data(), pkg.size());
xwrite(client, "|", 1);
xwrite(client, proc.data(), proc.size());
}
}
}
write_int(client, 0);

5
native/jni/zygisk/hook.cpp
View File

@@ -69,11 +69,6 @@ struct HookContext {
#undef DCL_PRE_POST
struct StringCmp {
using is_transparent = void;
bool operator()(string_view a, string_view b) const { return a < b; }
};
// Global variables
vector<tuple<const char *, const char *, void **>> *xhook_list;
map<string, vector<JNINativeMethod>, StringCmp> *jni_hook_list;