TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 12:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Isolate root daemon from requests

Browse Source
This commit is contained in:
topjohnwu
2017-04-22 00:54:08 +08:00
parent 38c867ea94
commit be5739508b
6 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jni/daemon/daemon.c
View File

@@ -23,7 +23,9 @@
pthread_t sepol_patch;
static void request_handler(int client) {
static void *request_handler(void *args) {
int client = *((int *) args);
free(args);
client_request req = read_int(client);
char *s;
int pid, status, code;
@@ -68,6 +70,7 @@ static void request_handler(int client) {
close(client);
break;
}
return NULL;
}
/* Setup the address and return socket fd */
@@ -112,12 +115,12 @@ void start_daemon() {
xsetsid();
xsetcon("u:r:su:s0");
// Patch selinux with medium patch, blocking
// Patch selinux with medium patch before we do anything
load_policydb("/sys/fs/selinux/policy");
sepol_med_rules();
dump_policydb("/sys/fs/selinux/load");
// Continue the larger patch in another thread, will join later
// Continue the larger patch in another thread, we will need to join later
pthread_create(&sepol_patch, NULL, large_sepol_patch, NULL);
struct sockaddr_un sun;
@@ -144,11 +147,18 @@ void start_daemon() {
xmount(NULL, "/", NULL, MS_REMOUNT, NULL);
create_links(NULL, "/sbin");
chmod("/sbin", 0755);
mkdir("/magisk", 0755);
chmod("/magisk", 0755);
xmount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL);
// Loop forever to listen to requests
while(1) {
request_handler(xaccept(fd, NULL, NULL));
int *client = xmalloc(sizeof(int));
*client = xaccept(fd, NULL, NULL);
pthread_t thread;
xpthread_create(&thread, NULL, request_handler, client);
// Detach the thread, we will never join it
pthread_detach(thread);
}
}

3
jni/daemon/log_monitor.c
View File

@@ -32,5 +32,6 @@ static void *logger_thread(void *args) {
/* Start a new thread to monitor logcat and dump to logfile */
void monitor_logs() {
pthread_t log_monitor_thread;
pthread_create(&log_monitor_thread, NULL, logger_thread, NULL);
xpthread_create(&log_monitor_thread, NULL, logger_thread, NULL);
pthread_detach(log_monitor_thread);
}