Add another test for fclose on an unopened file

Add new file libio/tst-fclose-unopened2.c that tests whether fclose on an
unopened file returns EOF.

This test differs from tst-fclose-unopened.c by ensuring the file's buffer
is allocated prior to double-fclose.  A comment in tst-fclose-unopened.c
now clarifies that it is testing a file with an unallocated buffer.

Calling fclose on unopened files normally causes a use-after-free bug,
however the standard streams are an exception since they are not
deallocated by fclose.

Tested for x86_64.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Aaron Merey 2024-09-19 09:53:23 -04:00
parent fa1b0d5e9f
commit 35dc62de3d
4 changed files with 69 additions and 3 deletions

View File

@ -96,6 +96,7 @@ tests = \
tst-ext \ tst-ext \
tst-ext2 \ tst-ext2 \
tst-fclose-unopened \ tst-fclose-unopened \
tst-fclose-unopened2 \
tst-fdopen-seek-failure \ tst-fdopen-seek-failure \
tst-fgetc-after-eof \ tst-fgetc-after-eof \
tst-fgetwc \ tst-fgetwc \
@ -251,6 +252,9 @@ LDFLAGS-tst-bz24228 = -Wl,--version-script=tst-bz24228.map
tst_wprintf2-ARGS = "Some Text" tst_wprintf2-ARGS = "Some Text"
tst-fclose-unopened2-ENV = \
MALLOC_TRACE=$(objpfx)tst-fclose-unopened2.mtrace \
LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so
test-fmemopen-ENV = MALLOC_TRACE=$(objpfx)test-fmemopen.mtrace \ test-fmemopen-ENV = MALLOC_TRACE=$(objpfx)test-fmemopen.mtrace \
LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so
tst-fdopen-seek-failure-ENV = \ tst-fdopen-seek-failure-ENV = \
@ -275,6 +279,8 @@ generated += \
tst-bz22415.mtrace \ tst-bz22415.mtrace \
tst-bz24228.check \ tst-bz24228.check \
tst-bz24228.mtrace \ tst-bz24228.mtrace \
tst-fclose-unopened2.check \
tst-fclose-unopened2.mtrace \
tst-fdopen-seek-failure.check \ tst-fdopen-seek-failure.check \
tst-fdopen-seek-failure.mtrace \ tst-fdopen-seek-failure.mtrace \
tst-fopenloc.check \ tst-fopenloc.check \
@ -313,6 +319,7 @@ tests-special += \
$(objpfx)test-fmemopen-mem.out \ $(objpfx)test-fmemopen-mem.out \
$(objpfx)tst-bz22415-mem.out \ $(objpfx)tst-bz22415-mem.out \
$(objpfx)tst-bz24228-mem.out \ $(objpfx)tst-bz24228-mem.out \
$(objpfx)tst-fclose-unopened2-mem.out \
$(objpfx)tst-fdopen-seek-failure-mem.out \ $(objpfx)tst-fdopen-seek-failure-mem.out \
$(objpfx)tst-fopenloc-mem.out \ $(objpfx)tst-fopenloc-mem.out \
# tests-special # tests-special
@ -400,6 +407,11 @@ $(objpfx)test-fmemopen-mem.out: $(objpfx)test-fmemopen.out
$(common-objpfx)malloc/mtrace $(objpfx)test-fmemopen.mtrace > $@; \ $(common-objpfx)malloc/mtrace $(objpfx)test-fmemopen.mtrace > $@; \
$(evaluate-test) $(evaluate-test)
$(objpfx)tst-fclose-unopened2-mem.out: $(objpfx)tst-fclose-unopened2.out
$(common-objpfx)malloc/mtrace \
$(objpfx)tst-fclose-unopened2.mtrace > $@; \
$(evaluate-test)
$(objpfx)tst-fdopen-seek-failure-mem.out: $(objpfx)tst-fdopen-seek-failure.out $(objpfx)tst-fdopen-seek-failure-mem.out: $(objpfx)tst-fdopen-seek-failure.out
$(common-objpfx)malloc/mtrace \ $(common-objpfx)malloc/mtrace \
$(objpfx)tst-fdopen-seek-failure.mtrace > $@; \ $(objpfx)tst-fdopen-seek-failure.mtrace > $@; \

View File

@ -19,9 +19,11 @@
#include <stdio.h> #include <stdio.h>
#include <support/check.h> #include <support/check.h>
/* Verify that fclose on an unopened file returns EOF. This is not part /* Verify that fclose on an unopened file returns EOF. This test uses
of the fclose external contract but there are dependancies on this a file with an unallocated buffer.
behaviour. */
This is not part of the fclose external contract but there are
dependencies on this behaviour. */
static int static int
do_test (void) do_test (void)

View File

@ -0,0 +1,51 @@
/* Test using fclose on an unopened file.
Copyright (C) 2024 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <mcheck.h>
#include <stdio.h>
#include <support/check.h>
/* Verify that fclose on an unopened file returns EOF. This test uses
a file with an allocated buffer.
This is not part of the fclose external contract but there are
dependencies on this behaviour. */
static int
do_test (void)
{
mtrace ();
/* Input file tst-fclose-unopened2.input has 6 bytes plus newline. */
char buf[6];
/* Read from the file to ensure its internal buffer is allocated. */
TEST_COMPARE (fread (buf, 1, sizeof (buf), stdin), sizeof (buf));
TEST_COMPARE (fclose (stdin), 0);
/* Attempt to close the unopened file and verify that EOF is returned.
Calling fclose on a file twice normally causes a use-after-free bug,
however the standard streams are an exception since they are not
deallocated by fclose. */
TEST_COMPARE (fclose (stdin), EOF);
return 0;
}
#include <support/test-driver.c>

View File

@ -0,0 +1 @@
fclose