generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 177ba8cb: Prevent deadlock when using fork

Browse Source 
* commit '177ba8cb42ed6d232e7c8bcad5e6ee21fc51a0e8':
  Prevent deadlock when using fork
This commit is contained in:
Rabin Vincent 2011-12-06 13:59:56 -08:00 committed by Android Git Automerger
commit a73de44b7c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libc/bionic/cpuacct.c
View File

@ -30,16 +30,19 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "cpuacct.h" #include "cpuacct.h"
#include <fcntl.h>
int cpuacct_add(uid_t uid) int cpuacct_add(uid_t uid)
{ {
int count; int count;
FILE *fp; int fd;
char buf[80]; char buf[80];
ssize_t n;
int ret = 0;
count = snprintf(buf, sizeof(buf), "/acct/uid/%d/tasks", uid); count = snprintf(buf, sizeof(buf), "/acct/uid/%d/tasks", uid);
fp = fopen(buf, "w+"); fd = open(buf, O_RDWR | O_CREAT, 0666);
if (!fp) { if (fd == -1) {
/* Note: sizeof("tasks") returns 6, which includes the NULL char */ /* Note: sizeof("tasks") returns 6, which includes the NULL char */
buf[count - sizeof("tasks")] = 0; buf[count - sizeof("tasks")] = 0;
if (mkdir(buf, 0775) < 0) if (mkdir(buf, 0775) < 0)
@ -47,14 +50,19 @@ int cpuacct_add(uid_t uid)
/* Note: sizeof("tasks") returns 6, which includes the NULL char */ /* Note: sizeof("tasks") returns 6, which includes the NULL char */
buf[count - sizeof("tasks")] = '/'; buf[count - sizeof("tasks")] = '/';
fp = fopen(buf, "w+"); fd = open(buf, O_RDWR | O_CREAT, 0666);
} }
if (!fp) if (fd == -1)
return -errno; return -errno;
fprintf(fp, "0"); n = TEMP_FAILURE_RETRY(write(fd, "0", 1));
if (fclose(fp)) if (n < 0)
ret = -errno;
else if (n == 0)
ret = -EIO;
if (TEMP_FAILURE_RETRY(close(fd)) == -1)
return -errno; return -errno;
return 0; return ret;
} }