TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 02:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swap out inotify fd before adding watch targets

Browse Source
This commit is contained in:
topjohnwu 2019-02-18 03:18:11 -05:00
parent 31a27838f5
commit 50ff11405f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/jni/magiskhide/proc_monitor.cpp
View File

@ -193,6 +193,7 @@ static int xinotify_add_watch(int fd, const char* path, uint32_t mask) {
static int new_inotify; static int new_inotify;
static const string_view APK_EXT(".apk"); static const string_view APK_EXT(".apk");
static vector<string> hide_apks;
static bool parse_packages_xml(string_view &s) { static bool parse_packages_xml(string_view &s) {
if (!str_starts(s, "<package ")) if (!str_starts(s, "<package "))
@ -212,7 +213,7 @@ static bool parse_packages_xml(string_view &s) {
} else if (strcmp(key, "codePath") == 0) { } else if (strcmp(key, "codePath") == 0) {
if (ends_with(value_view, APK_EXT)) { if (ends_with(value_view, APK_EXT)) {
// Directly add to inotify list // Directly add to inotify list
xinotify_add_watch(new_inotify, value, IN_OPEN); hide_apks.emplace_back(value);
} else { } else {
DIR *dir = opendir(value); DIR *dir = opendir(value);
if (dir == nullptr) if (dir == nullptr)
@ -222,7 +223,7 @@ static bool parse_packages_xml(string_view &s) {
if (ends_with(entry->d_name, APK_EXT)) { if (ends_with(entry->d_name, APK_EXT)) {
strcpy(value + value_view.length(), "/"); strcpy(value + value_view.length(), "/");
strcpy(value + value_view.length() + 1, entry->d_name); strcpy(value + value_view.length() + 1, entry->d_name);
xinotify_add_watch(new_inotify, value, IN_OPEN); hide_apks.emplace_back(value);
break; break;
} }
} }
@ -244,19 +245,22 @@ void update_inotify_mask() {
fcntl(new_inotify, F_SETFD, FD_CLOEXEC); fcntl(new_inotify, F_SETFD, FD_CLOEXEC);
LOGD("proc_monitor: Updating inotify list\n"); LOGD("proc_monitor: Updating inotify list\n");
hide_apks.clear();
{ {
MutexGuard lock(list_lock); MutexGuard lock(list_lock);
hide_uid.clear(); hide_uid.clear();
file_readline("/data/system/packages.xml", parse_packages_xml, true); file_readline("/data/system/packages.xml", parse_packages_xml, true);
} }
// Add /data/system to monitor /data/system/packages.xml // Swap out and close old inotify_fd
xinotify_add_watch(new_inotify, "/data/system", IN_CLOSE_WRITE);
int tmp = inotify_fd; int tmp = inotify_fd;
inotify_fd = new_inotify; inotify_fd = new_inotify;
if (tmp >= 0) if (tmp >= 0)
close(tmp); close(tmp);
for (auto apk : hide_apks)
xinotify_add_watch(inotify_fd, apk.data(), IN_OPEN);
xinotify_add_watch(inotify_fd, "/data/system", IN_CLOSE_WRITE);
} }
void proc_monitor() { void proc_monitor() {