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

Ensure we initialize stdin/stdout/stderr's recursive mutexes.

Browse Source 
(cherry-pick of 6a03abcfd23f31d1df06eb0059830e22621282bb.)

Bug: 18208568
Change-Id: I9da16ce0f9375bc363d1d02be706d73fd3b1e150
This commit is contained in:
Elliott Hughes 2014-11-03 12:32:17 -08:00
parent 445111a1c9
commit d18f4b2578
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -60,6 +60,7 @@ libc_common_src_files := \
bionic/siginterrupt.c \ bionic/siginterrupt.c \
bionic/sigsetmask.c \ bionic/sigsetmask.c \
bionic/system_properties_compat.c \ bionic/system_properties_compat.c \
stdio/findfp.c \
stdio/snprintf.c\ stdio/snprintf.c\
stdio/sprintf.c \ stdio/sprintf.c \
@ -389,7 +390,6 @@ libc_upstream_openbsd_src_files := \
upstream-openbsd/lib/libc/stdio/fgetwc.c \ upstream-openbsd/lib/libc/stdio/fgetwc.c \
upstream-openbsd/lib/libc/stdio/fgetws.c \ upstream-openbsd/lib/libc/stdio/fgetws.c \
upstream-openbsd/lib/libc/stdio/fileno.c \ upstream-openbsd/lib/libc/stdio/fileno.c \
upstream-openbsd/lib/libc/stdio/findfp.c \
upstream-openbsd/lib/libc/stdio/fprintf.c \ upstream-openbsd/lib/libc/stdio/fprintf.c \
upstream-openbsd/lib/libc/stdio/fpurge.c \ upstream-openbsd/lib/libc/stdio/fpurge.c \
upstream-openbsd/lib/libc/stdio/fputc.c \ upstream-openbsd/lib/libc/stdio/fputc.c \

25
libc/upstream-openbsd/lib/libc/stdio/findfp.c → libc/stdio/findfp.c
View File

@ -49,10 +49,8 @@ int __sdidinit;
#define NDYNAMIC 10 /* add ten more whenever necessary */ #define NDYNAMIC 10 /* add ten more whenever necessary */
#define std(flags, file) \ #define std(flags, file) \
{0,0,0,flags,file,{0,0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \ {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \
{(unsigned char *)(__sFext+file), 0},NULL,0,{0,0,0},{0},{0,0},0,0} {(unsigned char *)(__sFext+file), 0},NULL,0,{0},{0},{0},0,0}
/* p r w flags file _bf z cookie close read seek write
ext */
/* the usual - (stdin + stdout + stderr) */ /* the usual - (stdin + stdout + stderr) */
static FILE usual[FOPEN_MAX - 3]; static FILE usual[FOPEN_MAX - 3];
@ -165,17 +163,26 @@ void
__sinit(void) __sinit(void)
{ {
_THREAD_PRIVATE_MUTEX(__sinit_mutex); _THREAD_PRIVATE_MUTEX(__sinit_mutex);
int i;
_THREAD_PRIVATE_MUTEX_LOCK(__sinit_mutex); _THREAD_PRIVATE_MUTEX_LOCK(__sinit_mutex);
if (__sdidinit) if (__sdidinit) {
goto out; /* bail out if caller lost the race */ /* bail out if caller lost the race */
for (i = 0; i < FOPEN_MAX - 3; i++) { _THREAD_PRIVATE_MUTEX_UNLOCK(__sinit_mutex);
return;
}
/* Initialize stdin/stdout/stderr (for the recursive mutex). http://b/18208568. */
for (size_t i = 0; i < 3; ++i) {
_FILEEXT_SETUP(__sF+i, __sFext+i);
}
/* Initialize the pre-allocated (but initially unused) streams. */
for (size_t i = 0; i < FOPEN_MAX - 3; ++i) {
_FILEEXT_SETUP(usual+i, usualext+i); _FILEEXT_SETUP(usual+i, usualext+i);
} }
/* make sure we clean up on exit */ /* make sure we clean up on exit */
__atexit_register_cleanup(_cleanup); /* conservative */ __atexit_register_cleanup(_cleanup); /* conservative */
__sdidinit = 1; __sdidinit = 1;
out:
_THREAD_PRIVATE_MUTEX_UNLOCK(__sinit_mutex); _THREAD_PRIVATE_MUTEX_UNLOCK(__sinit_mutex);
} }

17
tests/stdio_test.cpp
View File

@ -29,6 +29,23 @@
#include "TemporaryFile.h" #include "TemporaryFile.h"
TEST(stdio, flockfile_18208568_stderr) {
// Check that we have a _recursive_ mutex for flockfile.
flockfile(stderr);
feof(stderr); // We don't care about the result, but this needs to take the lock.
funlockfile(stderr);
}
TEST(stdio, flockfile_18208568_regular) {
// We never had a bug for streams other than stdin/stdout/stderr, but test anyway.
FILE* fp = fopen("/dev/null", "w");
ASSERT_TRUE(fp != NULL);
flockfile(fp);
feof(fp);
funlockfile(fp);
fclose(fp);
}
TEST(stdio, tmpfile_fileno_fprintf_rewind_fgets) { TEST(stdio, tmpfile_fileno_fprintf_rewind_fgets) {
FILE* fp = tmpfile(); FILE* fp = tmpfile();
ASSERT_TRUE(fp != NULL); ASSERT_TRUE(fp != NULL);