From 27f10a09630cac9bc0816e2a46cd9912379aaea8 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 26 Jun 2018 21:48:48 +0000 Subject: Fix hardcoded /tmp paths in testing (bug 13888). As noted in bug 13888, and as I noted previously in , various tests used hardcoded paths in /tmp, so posing issues for simultaneous test runs from different build directories. This patch fixes such uses of hardcoded file names to put them in the build directory instead (in the case of stdio-common/bug5 the file names are changed as well, to avoid a conflict with the name bug5.out also used for the automatic test output redirection). It also fixes test-installation.pl likewise (that was using filenames with $$ in them rather than strictly hardcoded names, but that's still not good practice for temporary file naming). Note that my list of files changed is not identical to that in bug 13888. I added tst-spawn3.c and test-installation.pl, and removed some tests that seem to me (now) to create temporary files securely (simply using /tmp is not itself a problem if the temporary files are handled properly with mkstemp; I haven't checked whether those tests used to do things insecurely). conformtest is not changed because the makefiles always pass a --tmpdir option so the /tmp default is irrelevant, and for the same reason there is no actual problem with nptl/tst-umask1.c because again the makefiles always override the default. nptl/sockperf.c is ignored because there is no code to run it; probably that file should actually be removed. Some tests use the mktemp function, but I think they all use it in a way that *is* secure (for generating names for directories / sockets / fifos / symlinks, where the operation using the name will not follow symlinks and so there is no potential for a symlink attack on the account running the testsuite). Some tests use the tmpnam function to generate temporary file names. This is in principle insecure, but not addressed by this patch (I consider it a separate issue from the fully hardcoded paths). Tested for x86_64. [BZ #13888] * posix/Makefile (CFLAGS-tst-spawn3.c): New variable. * posix/tst-spawn3.c (do_test): Put tst-spwan3.pid in OBJPFX, not /tmp. * scripts/test-installation.pl: Put temporary files in build directory, not /tmp. * stdio-common/Makefile (CFLAGS-bug3.c): New variable. (CFLAGS-bug4.c): Likewise. (CFLAGS-bug5.c): Likewise. (CFLAGS-test-fseek.c): Likewise. (CFLAGS-test-popen.c): Likewise. (CFLAGS-test_rdwr.c): Likewise. * stdio-common/bug3.c (main): Put temporary file in OBJPFX, not /tmp. * stdio-common/bug4.c (main): Likewise. * stdio-common/bug5.c (main): Likewise. * stdio-common/test-fseek.c (TESTFILE): Likewise. * stdio-common/test-popen.c (do_test): Likewise. * stdio-common/test_rdwr.c (main): Likewise. --- stdio-common/Makefile | 7 +++++++ stdio-common/bug3.c | 2 +- stdio-common/bug4.c | 2 +- stdio-common/bug5.c | 4 ++-- stdio-common/test-fseek.c | 2 +- stdio-common/test-popen.c | 8 ++++---- stdio-common/test_rdwr.c | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 45038372ff..738a3cead0 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -145,6 +145,13 @@ CFLAGS-scanf15.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \ CFLAGS-scanf17.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \ -I../wctype +CFLAGS-bug3.c += -DOBJPFX=\"$(objpfx)\" +CFLAGS-bug4.c += -DOBJPFX=\"$(objpfx)\" +CFLAGS-bug5.c += -DOBJPFX=\"$(objpfx)\" +CFLAGS-test-fseek.c += -DOBJPFX=\"$(objpfx)\" +CFLAGS-test-popen.c += -DOBJPFX=\"$(objpfx)\" +CFLAGS-test_rdwr.c += -DOBJPFX=\"$(objpfx)\" + # tst-gets.c tests a deprecated function. CFLAGS-tst-gets.c += -Wno-deprecated-declarations diff --git a/stdio-common/bug3.c b/stdio-common/bug3.c index 6b2ed6b8e0..62a6cab330 100644 --- a/stdio-common/bug3.c +++ b/stdio-common/bug3.c @@ -6,7 +6,7 @@ main (void) { FILE *f; int i; - const char filename[] = "/tmp/bug3.test"; + const char filename[] = OBJPFX "bug3.test"; f = fopen(filename, "w+"); for (i=0; i<9000; i++) diff --git a/stdio-common/bug4.c b/stdio-common/bug4.c index a0377862a5..cf7fe116eb 100644 --- a/stdio-common/bug4.c +++ b/stdio-common/bug4.c @@ -10,7 +10,7 @@ main (int argc, char *argv[]) FILE *f; int i; char buffer[31]; - const char filename[] = "/tmp/bug4.test"; + const char filename[] = OBJPFX "bug4.test"; while ((i = getopt (argc, argv, "rw")) != -1) switch (i) diff --git a/stdio-common/bug5.c b/stdio-common/bug5.c index f655845891..7bfe9b2b8d 100644 --- a/stdio-common/bug5.c +++ b/stdio-common/bug5.c @@ -14,8 +14,8 @@ main (void) { FILE *in; FILE *out; - static char inname[] = "/tmp/bug5.in"; - static char outname[] = "/tmp/bug5.out"; + static char inname[] = OBJPFX "bug5test.in"; + static char outname[] = OBJPFX "bug5test.out"; char *printbuf; size_t i; int result; diff --git a/stdio-common/test-fseek.c b/stdio-common/test-fseek.c index c313911d66..17cd90b053 100644 --- a/stdio-common/test-fseek.c +++ b/stdio-common/test-fseek.c @@ -17,7 +17,7 @@ #include -#define TESTFILE "/tmp/test.dat" +#define TESTFILE OBJPFX "test.dat" static int do_test (void) diff --git a/stdio-common/test-popen.c b/stdio-common/test-popen.c index 6e98d3c090..206f212468 100644 --- a/stdio-common/test-popen.c +++ b/stdio-common/test-popen.c @@ -59,7 +59,7 @@ do_test (void) the perhaps incompatible new shared libraries. */ unsetenv ("LD_LIBRARY_PATH"); - output = popen ("/bin/cat >/tmp/tstpopen.tmp", "w"); + output = popen ("/bin/cat >" OBJPFX "tstpopen.tmp", "w"); if (output == NULL) { perror ("popen"); @@ -69,10 +69,10 @@ do_test (void) write_data (output); wstatus = pclose (output); printf ("writing pclose returned %d\n", wstatus); - input = popen ("/bin/cat /tmp/tstpopen.tmp", "r"); + input = popen ("/bin/cat " OBJPFX "tstpopen.tmp", "r"); if (input == NULL) { - perror ("/tmp/tstpopen.tmp"); + perror (OBJPFX "tstpopen.tmp"); puts ("Test FAILED!"); exit (1); } @@ -80,7 +80,7 @@ do_test (void) rstatus = pclose (input); printf ("reading pclose returned %d\n", rstatus); - remove ("/tmp/tstpopen.tmp"); + remove (OBJPFX "tstpopen.tmp"); errno = 0; output = popen ("/bin/cat", "m"); diff --git a/stdio-common/test_rdwr.c b/stdio-common/test_rdwr.c index f471570cba..348987351f 100644 --- a/stdio-common/test_rdwr.c +++ b/stdio-common/test_rdwr.c @@ -38,7 +38,7 @@ main (int argc, char **argv) else name = *argv; - (void) sprintf (filename, "/tmp/%s.test", name); + (void) sprintf (filename, OBJPFX "%s.test", name); f = fopen (filename, "w+"); if (f == NULL) -- cgit 1.4.1