summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-06-03 12:21:01 -0700
committerColin Cross <ccross@android.com>2010-06-03 12:21:01 -0700
commit982a815c10cc28707d81c46112fc45b1c10df3be (patch)
tree7cfda92349422a52d9ede0045b5cac7d40153650 /init
parentf1a4618e99b26a588e15e8c467b21b3a1df74f64 (diff)
downloadsystem_core-982a815c10cc28707d81c46112fc45b1c10df3be.zip
system_core-982a815c10cc28707d81c46112fc45b1c10df3be.tar.gz
system_core-982a815c10cc28707d81c46112fc45b1c10df3be.tar.bz2
Reap firmware child processes to prevent zombies
Change-Id: Ic6c50b929a025f05450cd309238e60a857690d9b
Diffstat (limited to 'init')
-rw-r--r--init/devices.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/init/devices.c b/init/devices.c
index 663cdfe..155a41e 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -31,6 +31,7 @@
#include <private/android_filesystem_config.h>
#include <sys/time.h>
#include <asm/page.h>
+#include <sys/wait.h>
#include "devices.h"
#include "util.h"
@@ -537,6 +538,8 @@ root_free_out:
static void handle_firmware_event(struct uevent *uevent)
{
pid_t pid;
+ int status;
+ int ret;
if(strcmp(uevent->subsystem, "firmware"))
return;
@@ -549,6 +552,10 @@ static void handle_firmware_event(struct uevent *uevent)
if (!pid) {
process_firmware_event(uevent);
exit(EXIT_SUCCESS);
+ } else {
+ do {
+ ret = waitpid(pid, &status, 0);
+ } while (ret == -1 && errno == EINTR);
}
}