MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unblock signals before executing commands

Browse Source
This commit is contained in:
topjohnwu 2020-12-27 15:05:39 -08:00
parent 880de21596
commit db4f78d463
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
native/jni/utils/misc.cpp
View File

@ -2,9 +2,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #include <pwd.h>
#include <unistd.h> #include <unistd.h>
@ -30,10 +27,6 @@ int fork_no_orphan() {
int pid = xfork(); int pid = xfork();
if (pid) if (pid)
return pid; return pid;
// Unblock all signals
sigset_t block_set;
sigfillset(&block_set);
pthread_sigmask(SIG_UNBLOCK, &block_set, nullptr);
prctl(PR_SET_PDEATHSIG, SIGTERM); prctl(PR_SET_PDEATHSIG, SIGTERM);
if (getppid() == 1) if (getppid() == 1)
exit(1); exit(1);
@ -96,6 +89,11 @@ int exec_command(exec_t &exec) {
return pid; return pid;
} }
// Unblock all signals
sigset_t set;
sigfillset(&set);
pthread_sigmask(SIG_UNBLOCK, &set, nullptr);
if (outfd >= 0) { if (outfd >= 0) {
xdup2(outfd, STDOUT_FILENO); xdup2(outfd, STDOUT_FILENO);
if (exec.err) if (exec.err)