Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "zygote is killed by signal 1""

Browse Source
This commit is contained in:
hansson
2018-01-31 10:23:11 +00:00
committed by Gerrit Code Review
parent 01e426d158 435e84b9fc
commit 2372af9cd8
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -141,32 +141,45 @@ static void SigChldHandler(int /*signal_number*/) {
errno = saved_errno; errno = saved_errno;
} }
// Configures the SIGCHLD handler for the zygote process. This is configured // Configures the SIGCHLD/SIGHUP handlers for the zygote process. This is
// very late, because earlier in the runtime we may fork() and exec() // configured very late, because earlier in the runtime we may fork() and
// other processes, and we want to waitpid() for those rather than // exec() other processes, and we want to waitpid() for those rather than
// have them be harvested immediately. // have them be harvested immediately.
// //
// Ignore SIGHUP because all processes forked by the zygote are in the same
// process group as the zygote and we don't want to be notified if we become
// an orphaned group and have one or more stopped processes. This is not a
// theoretical concern :
// - we can become an orphaned group if one of our direct descendants forks
// and is subsequently killed before its children.
// - crash_dump routinely STOPs the process it's tracing.
//
// See issues b/71965619 and b/25567761 for further details.
//
// This ends up being called repeatedly before each fork(), but there's // This ends up being called repeatedly before each fork(), but there's
// no real harm in that. // no real harm in that.
static void SetSigChldHandler() { static void SetSignalHandlers() {
struct sigaction sa; struct sigaction sig_chld = {};
memset(&sa, 0, sizeof(sa)); sig_chld.sa_handler = SigChldHandler;
sa.sa_handler = SigChldHandler;
int err = sigaction(SIGCHLD, &sa, NULL); if (sigaction(SIGCHLD, &sig_chld, NULL) < 0) {
if (err < 0) {
ALOGW("Error setting SIGCHLD handler: %s", strerror(errno)); ALOGW("Error setting SIGCHLD handler: %s", strerror(errno));
} }
struct sigaction sig_hup = {};
sig_hup.sa_handler = SIG_IGN;
if (sigaction(SIGHUP, &sig_hup, NULL) < 0) {
ALOGW("Error setting SIGHUP handler: %s", strerror(errno));
}
} }
// Sets the SIGCHLD handler back to default behavior in zygote children. // Sets the SIGCHLD handler back to default behavior in zygote children.
static void UnsetSigChldHandler() { static void UnsetChldSignalHandler() {
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = SIG_DFL; sa.sa_handler = SIG_DFL;
int err = sigaction(SIGCHLD, &sa, NULL); if (sigaction(SIGCHLD, &sa, NULL) < 0) {
if (err < 0) {
ALOGW("Error unsetting SIGCHLD handler: %s", strerror(errno)); ALOGW("Error unsetting SIGCHLD handler: %s", strerror(errno));
} }
} }
@@ -505,7 +518,7 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
bool is_system_server, jintArray fdsToClose, bool is_system_server, jintArray fdsToClose,
jintArray fdsToIgnore, jintArray fdsToIgnore,
jstring instructionSet, jstring dataDir) { jstring instructionSet, jstring dataDir) {
SetSigChldHandler(); SetSignalHandlers();
sigset_t sigchld; sigset_t sigchld;
sigemptyset(&sigchld); sigemptyset(&sigchld);
@@ -682,7 +695,8 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
delete se_info; delete se_info;
delete se_name; delete se_name;
UnsetSigChldHandler(); // Unset the SIGCHLD handler, but keep ignoring SIGHUP (rationale in SetSignalHandlers).
UnsetChldSignalHandler();
env->CallStaticVoidMethod(gZygoteClass, gCallPostForkChildHooks, runtime_flags, env->CallStaticVoidMethod(gZygoteClass, gCallPostForkChildHooks, runtime_flags,
is_system_server, instructionSet); is_system_server, instructionSet);