TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-30 21:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard magiskhide state with mutexes

Browse Source
This commit is contained in:
topjohnwu 2020-05-16 23:31:30 -07:00
parent 1bcef38739
commit eca2168685
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
native/jni/magiskhide/hide_utils.cpp
View File

@ -34,6 +34,14 @@ void crawl_procfs(DIR *dir, const function<bool (int)> &fn) {
} }
} }
static bool hide_state = false;
static pthread_mutex_t hide_state_lock = PTHREAD_MUTEX_INITIALIZER;
bool hide_enabled() {
mutex_guard g(hide_state_lock);
return hide_state;
}
static bool proc_name_match(int pid, const char *name) { static bool proc_name_match(int pid, const char *name) {
char buf[4019]; char buf[4019];
sprintf(buf, "/proc/%d/cmdline", pid); sprintf(buf, "/proc/%d/cmdline", pid);
@ -206,39 +214,40 @@ void ls_list(int client) {
static void set_hide_config() { static void set_hide_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)",
DB_SETTING_KEYS[HIDE_CONFIG], hide_enabled); DB_SETTING_KEYS[HIDE_CONFIG], hide_state);
char *err = db_exec(sql); char *err = db_exec(sql);
db_err(err); db_err(err);
} }
[[noreturn]] static void launch_err(int client, int code = DAEMON_ERROR) { [[noreturn]] static void launch_err(int client, int code = DAEMON_ERROR) {
if (code != HIDE_IS_ENABLED) if (code != HIDE_IS_ENABLED)
hide_enabled = false; hide_state = false;
if (client >= 0) { if (client >= 0) {
write_int(client, code); write_int(client, code);
close(client); close(client);
} }
pthread_mutex_unlock(&hide_state_lock);
pthread_exit(nullptr); pthread_exit(nullptr);
} }
#define LAUNCH_ERR launch_err(client)
void launch_magiskhide(int client) { void launch_magiskhide(int client) {
if (SDK_INT < 19) pthread_mutex_lock(&hide_state_lock);
LAUNCH_ERR;
if (hide_enabled) if (SDK_INT < 19)
launch_err(client);
if (hide_state)
launch_err(client, HIDE_IS_ENABLED); launch_err(client, HIDE_IS_ENABLED);
if (access("/proc/1/ns/mnt", F_OK) != 0) if (access("/proc/1/ns/mnt", F_OK) != 0)
launch_err(client, HIDE_NO_NS); launch_err(client, HIDE_NO_NS);
hide_enabled = true; hide_state = true;
set_hide_config(); set_hide_config();
LOGI("* Starting MagiskHide\n"); LOGI("* Starting MagiskHide\n");
if (procfp == nullptr && (procfp = opendir("/proc")) == nullptr) if (procfp == nullptr && (procfp = opendir("/proc")) == nullptr)
LAUNCH_ERR; launch_err(client);
hide_sensitive_props(); hide_sensitive_props();
@ -247,7 +256,7 @@ void launch_magiskhide(int client) {
// Initialize the hide list // Initialize the hide list
if (!init_list()) if (!init_list())
LAUNCH_ERR; launch_err(client);
// Get thread reference // Get thread reference
proc_monitor_thread = pthread_self(); proc_monitor_thread = pthread_self();
@ -260,23 +269,23 @@ void launch_magiskhide(int client) {
proc_monitor(); proc_monitor();
// proc_monitor should not return // proc_monitor should not return
LAUNCH_ERR; launch_err(client);
} }
int stop_magiskhide() { int stop_magiskhide() {
LOGI("* Stopping MagiskHide\n"); LOGI("* Stopping MagiskHide\n");
if (hide_enabled) mutex_guard g(hide_state_lock);
if (hide_state)
pthread_kill(proc_monitor_thread, SIGTERMTHRD); pthread_kill(proc_monitor_thread, SIGTERMTHRD);
hide_state = false;
hide_enabled = false;
set_hide_config(); set_hide_config();
return DAEMON_SUCCESS; return DAEMON_SUCCESS;
} }
void auto_start_magiskhide() { void auto_start_magiskhide() {
if (hide_enabled) { if (hide_enabled()) {
pthread_kill(proc_monitor_thread, SIGZYGOTE); pthread_kill(proc_monitor_thread, SIGZYGOTE);
} else if (SDK_INT >= 19) { } else if (SDK_INT >= 19) {
db_settings dbs; db_settings dbs;

6
native/jni/magiskhide/magiskhide.cpp
View File

@ -16,8 +16,6 @@
using namespace std::literals; using namespace std::literals;
bool hide_enabled = false;
[[noreturn]] static void usage(char *arg0) { [[noreturn]] static void usage(char *arg0) {
fprintf(stderr, fprintf(stderr,
NAME_WITH_VER(MagiskHide) "\n\n" NAME_WITH_VER(MagiskHide) "\n\n"
@ -47,7 +45,7 @@ void magiskhide_handler(int client) {
case ADD_HIDELIST: case ADD_HIDELIST:
case RM_HIDELIST: case RM_HIDELIST:
case LS_HIDELIST: case LS_HIDELIST:
if (!hide_enabled) { if (!hide_enabled()) {
write_int(client, HIDE_NOT_ENABLED); write_int(client, HIDE_NOT_ENABLED);
close(client); close(client);
return; return;
@ -72,7 +70,7 @@ void magiskhide_handler(int client) {
client = -1; client = -1;
break; break;
case HIDE_STATUS: case HIDE_STATUS:
res = hide_enabled ? HIDE_IS_ENABLED : HIDE_NOT_ENABLED; res = hide_enabled() ? HIDE_IS_ENABLED : HIDE_NOT_ENABLED;
break; break;
} }

2
native/jni/magiskhide/magiskhide.hpp
View File

@ -30,13 +30,13 @@ void update_uid_map();
// Utility functions // Utility functions
void crawl_procfs(const std::function<bool (int)> &fn); void crawl_procfs(const std::function<bool (int)> &fn);
void crawl_procfs(DIR *dir, const std::function<bool (int)> &fn); void crawl_procfs(DIR *dir, const std::function<bool (int)> &fn);
bool hide_enabled();
// Hide policies // Hide policies
void hide_daemon(int pid); void hide_daemon(int pid);
void hide_unmount(int pid = getpid()); void hide_unmount(int pid = getpid());
void hide_sensitive_props(); void hide_sensitive_props();
extern bool hide_enabled;
extern pthread_mutex_t monitor_lock; extern pthread_mutex_t monitor_lock;
extern std::set<std::pair<std::string, std::string>> hide_set; extern std::set<std::pair<std::string, std::string>> hide_set;