lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Avoid insecure usage of tmpnam in tests.

Browse Source 
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.
This commit is contained in:
Joseph Myers
2018-07-18 21:04:12 +00:00
parent 6d90776dff
commit 5c112f1b62
13 changed files with 127 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stdio-common/bug7.c
View File

@ -1,21 +1,25 @@
/* Regression test for fseek and freopen bugs. */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int
main (int argc, char *argv[])
{
int lose = 0;
char filename[L_tmpnam];
char filename[] = "/tmp/bug7.XXXXXX";
FILE *fp;
if (tmpnam (filename) == NULL)
int fd = mkstemp (filename);
if (fd == -1)
{
printf ("tmpnam failed\n");
printf ("mkstemp failed\n");
lose = 1;
}
else
{
close (fd);
fp = fopen (filename, "w+");
fprintf (fp, "Hello world!\n");
fflush (fp);
@ -32,17 +36,21 @@ main (int argc, char *argv[])
{
FILE *file1;
FILE *file2;
char filename1[L_tmpnam];
char filename2[L_tmpnam];
char filename1[] = "/tmp/bug7.XXXXXX";
char filename2[] = "/tmp/bug7.XXXXXX";
int ch;
if (tmpnam (filename1) == NULL || tmpnam (filename2) == NULL)
int fd1 = mkstemp (filename1);
int fd2 = mkstemp (filename2);
if (fd1 == -1 || fd2 == -1)
{
printf ("tmpnam failed\n");
printf ("mkstemp failed\n");
lose = 1;
}
else
{
close (fd1);
close (fd2);
file1 = fopen (filename1, "w");
fclose (file1);