diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-07-18 21:04:12 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-07-18 21:04:12 +0000 |
commit | 5c112f1b62b6fca7348c64a004e9fc4cfdaca1ad (patch) | |
tree | 67ea596cd3c6810bb13df1fb6a1e0d2ae29f7120 /grp | |
parent | x86/CET: Document glibc.tune.x86_ibt and glibc.tune.x86_shstk (diff) | |
download | glibc-5c112f1b62b6fca7348c64a004e9fc4cfdaca1ad.tar.gz glibc-5c112f1b62b6fca7348c64a004e9fc4cfdaca1ad.tar.bz2 glibc-5c112f1b62b6fca7348c64a004e9fc4cfdaca1ad.zip |
Avoid insecure usage of tmpnam in tests.
Various glibc testcases use tmpnam in ways subject to race conditions
(generate a temporary file name, then later open that file without
O_EXCL).
This patch fixes those tests to use mkstemp - generally a minimal
local fix to use mkstemp instead of tmpnam, rather than a larger fix
to use other testsuite infrastructure for temporary files. The
unchanged use of tmpnam in posix/wordexp-test.c would fail safe in the
event of a race (it's generating a name for use with mkdir rather than
for a file to be opened for writing).
Tested for x86_64.
* grp/tst_fgetgrent.c: Include <unistd.h>.
(main): Use mkstemp instead of tmpnam.
* io/test-utime.c (main): Likewise.
* posix/annexc.c (macrofile): Change to modifiable array.
(get_null_defines): Use mkstemp instead of tmpnam. Do not remove
macrofile here.
* posix/bug-getopt1.c: Include <stdlib.h>.
(do_test): Use mkstemp instead of tmpnam.
* posix/bug-getopt2.c: Include <stdlib.h>.
(do_test): Use mkstemp instead of tmpnam.
* posix/bug-getopt3.c: Include <stdlib.h>.
(do_test): Use mkstemp instead of tmpnam.
* posix/bug-getopt4.c: Include <stdlib.h>.
(do_test): Use mkstemp instead of tmpnam.
* posix/bug-getopt5.c: Include <stdlib.h>.
(do_test): Use mkstemp instead of tmpnam.
* stdio-common/bug7.c: Include <stdlib.h> and <unistd.h>.
(main): Use mkstemp instead of tmpnam.
* stdio-common/tst-fdopen.c: Include <stdlib.h>.
(main): Use mkstemp instead of tmpnam.
* stdio-common/tst-ungetc.c: Include <stdlib.h>.
(main): use mkstemp instead of tmpnam.
* stdlib/isomac.c (macrofile): Change to modifiable array.
(get_null_defines): Use mkstemp instead of tmpnam. Do not remove
macrofile here.
Diffstat (limited to 'grp')
-rw-r--r-- | grp/tst_fgetgrent.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/grp/tst_fgetgrent.c b/grp/tst_fgetgrent.c index 501ad99727..d612445fed 100644 --- a/grp/tst_fgetgrent.c +++ b/grp/tst_fgetgrent.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <unistd.h> static int errors; @@ -99,7 +100,14 @@ test_fgetgrent (const char *filename) int main (int argc, char *argv[]) { - char *file = tmpnam (NULL); + char file[] = "/tmp/tst_fgetgrent.XXXXXX"; + int fd = mkstemp (file); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + return 1; + } + close (fd); int i = 0; if (argc > 1) |