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

Zygote : Block SIGCHLD during fork. am: b1f1209d9a

Browse Source 
am: 35b8453338

Change-Id: I7c73b1a37d79f31ad8fff6d0b83426debbfd88f9
This commit is contained in:
Narayan Kamath
2016-11-10 11:12:11 +00:00
committed by android-build-merger
parent 846f64c6fc 35b8453338
commit 14bd75fa79
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -446,6 +446,20 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
ckTime(start, "ForkAndSpecializeCommon:SetSigChldHandler"); ckTime(start, "ForkAndSpecializeCommon:SetSigChldHandler");
sigset_t sigchld;
sigemptyset(&sigchld);
sigaddset(&sigchld, SIGCHLD);
// Temporarily block SIGCHLD during forks. The SIGCHLD handler might
// log, which would result in the logging FDs we close being reopened.
// This would cause failures because the FDs are not whitelisted.
//
// Note that the zygote process is single threaded at this point.
if (sigprocmask(SIG_BLOCK, &sigchld, NULL) == -1) {
ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_BLOCK, { SIGCHLD }) failed.");
}
// Close any logging related FDs before we start evaluating the list of // Close any logging related FDs before we start evaluating the list of
// file descriptors. // file descriptors.
__android_log_close(); __android_log_close();
@@ -479,6 +493,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
RuntimeAbort(env, __LINE__, "Unable to reopen whitelisted descriptors."); RuntimeAbort(env, __LINE__, "Unable to reopen whitelisted descriptors.");
} }
if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) {
ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed.");
}
// Keep capabilities across UID change, unless we're staying root. // Keep capabilities across UID change, unless we're staying root.
if (uid != 0) { if (uid != 0) {
EnableKeepCapabilities(env); EnableKeepCapabilities(env);
@@ -613,6 +632,12 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
} }
} else if (pid > 0) { } else if (pid > 0) {
// the parent process // the parent process
// We blocked SIGCHLD prior to a fork, we unblock it here.
if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) {
ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed.");
}
} }
return pid; return pid;
} }