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

Remove err_handler

Browse Source
This commit is contained in:
topjohnwu
2017-10-13 22:25:16 +08:00
parent 2a8898e7c3
commit cddeaffada
10 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jni/magiskhide/hide_utils.c
View File

@@ -187,7 +187,6 @@ int destroy_list() {
}
void add_hide_list(int client) {
err_handler = do_nothing;
char *proc = read_string(client);
// ack
write_int(client, add_list(proc));
@@ -195,7 +194,6 @@ void add_hide_list(int client) {
}
void rm_hide_list(int client) {
err_handler = do_nothing;
char *proc = read_string(client);
// ack
write_int(client, rm_list(proc));
@@ -203,7 +201,6 @@ void rm_hide_list(int client) {
}
void ls_hide_list(int client) {
err_handler = do_nothing;
if (!hideEnabled) {
write_int(client, HIDE_NOT_ENABLED);
return;

3
jni/magiskhide/magiskhide.c
View File

@@ -41,9 +41,6 @@ static void usage(char *arg0) {
}
void launch_magiskhide(int client) {
// We manually handle crashes
err_handler = do_nothing;
if (hideEnabled) {
if (client > 0) {
write_int(client, HIDE_IS_ENABLED);

17
jni/magiskhide/proc_monitor.c
View File

@@ -24,7 +24,6 @@ static int zygote_num, has_cache = 1, pipefd[2] = { -1, -1 };
// Workaround for the lack of pthread_cancel
static void quit_pthread(int sig) {
err_handler = do_nothing;
LOGD("proc_monitor: running cleanup\n");
destroy_list();
hideEnabled = 0;
@@ -39,11 +38,6 @@ static void quit_pthread(int sig) {
pthread_exit(NULL);
}
static void proc_monitor_err() {
LOGE("proc_monitor: error occured, stopping magiskhide services\n");
quit_pthread(SIGUSR1);
}
static int read_namespace(const int pid, char* target, const size_t size) {
char path[32];
snprintf(path, sizeof(path), "/proc/%d/ns/mnt", pid);
@@ -69,14 +63,8 @@ static void lazy_unmount(const char* mountpoint) {
LOGD("hide_daemon: Unmount Failed (%s)\n", mountpoint);
}
static void hide_daemon_err() {
LOGE("hide_daemon: error occured\n");
}
static void hide_daemon(int pid) {
LOGD("hide_daemon: start unmount for pid=[%d]\n", pid);
// When an error occurs, report its failure
err_handler = hide_daemon_err;
char *line, buffer[PATH_MAX];
struct vector mount_list;
@@ -152,15 +140,12 @@ void proc_monitor() {
act.sa_handler = quit_pthread;
sigaction(SIGUSR1, &act, NULL);
// The error handler should stop magiskhide services
err_handler = proc_monitor_err;
cache_block[0] = '\0';
// Get the mount namespace of init
if (read_namespace(1, init_ns, 32)) {
LOGE("proc_monitor: Your kernel doesn't support mount namespace :(\n");
proc_monitor_err();
quit_pthread(SIGUSR1);
}
LOGI("proc_monitor: init ns=%s\n", init_ns);