From 74a7b91cbe29d3a9e6500fb90aae6d9a858dc1f7 Mon Sep 17 00:00:00 2001 From: Rom Lemarchand Date: Mon, 11 Mar 2013 14:00:58 -0700 Subject: liblogwrap: lock android_fork_execvp Add a lock around android_fork_execvp to ensure no two threads can execute it at the same time. This is to help with http://b/8333626 Change-Id: I75d087a74b58f5b8e878675b301200f54d976fb2 --- logwrapper/logwrap.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'logwrapper') diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c index b2abfe2..129ffb1 100644 --- a/logwrapper/logwrap.c +++ b/logwrapper/logwrap.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "private/android_filesystem_config.h" @@ -35,6 +36,7 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) static int signal_fd_write; +static pthread_mutex_t fd_mutex = PTHREAD_MUTEX_INITIALIZER; #define ERROR(fmt, args...) \ do { \ @@ -204,6 +206,12 @@ int android_fork_execvp(int argc, char* argv[], int *status, bool ignore_int_qui int sockets[2]; int rc = 0; + rc = pthread_mutex_lock(&fd_mutex); + if (rc) { + ERROR("failed to lock signal_fd mutex\n"); + goto err_lock; + } + /* Use ptty instead of socketpair so that STDOUT is not buffered */ parent_ptty = open("/dev/ptmx", O_RDWR); if (parent_ptty < 0) { @@ -231,6 +239,7 @@ int android_fork_execvp(int argc, char* argv[], int *status, bool ignore_int_qui rc = -1; goto err_fork; } else if (pid == 0) { + pthread_mutex_unlock(&fd_mutex); pthread_sigmask(SIG_SETMASK, &oldset, NULL); close(parent_ptty); @@ -299,5 +308,7 @@ err_fork: err_ptty: close(parent_ptty); err_open: + pthread_mutex_unlock(&fd_mutex); +err_lock: return rc; } -- cgit v1.1