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

am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev

Browse Source 
* commit '1bc7d0c84a1fbd27add883b8e000096677a1ca22':
  Save/restore errno in SIGCHLD handler.
This commit is contained in:
Christopher Ferris
2015-09-01 00:31:30 +00:00
committed by Android Git Automerger
parent f7bf24ad1d 1bc7d0c84a
commit d6597cb43c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -83,6 +83,14 @@ static void SigChldHandler(int /*signal_number*/) {
pid_t pid; pid_t pid;
int status; int status;
// It's necessary to save and restore the errno during this function.
// Since errno is stored per thread, changing it here modifies the errno
// on the thread on which this signal handler executes. If a signal occurs
// between a call and an errno check, it's possible to get the errno set
// here.
// See b/23572286 for extra information.
int saved_errno = errno;
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
// Log process-death status that we care about. In general it is // Log process-death status that we care about. In general it is
// not safe to call LOG(...) from a signal handler because of // not safe to call LOG(...) from a signal handler because of
@@ -118,6 +126,8 @@ static void SigChldHandler(int /*signal_number*/) {
if (pid < 0 && errno != ECHILD) { if (pid < 0 && errno != ECHILD) {
ALOGW("Zygote SIGCHLD error in waitpid: %s", strerror(errno)); ALOGW("Zygote SIGCHLD error in waitpid: %s", strerror(errno));
} }
errno = saved_errno;
} }
// Configures the SIGCHLD handler for the zygote process. This is configured // Configures the SIGCHLD handler for the zygote process. This is configured