Correct access attribute on memfrob (bug 28475)

As noted in bug 28475, the access attribute on memfrob in <string.h>
is incorrect: the function both reads and writes the memory pointed to
by its argument, so it needs to use __read_write__, not
__write_only__.  This incorrect attribute results in a build failure
for accessing uninitialized memory for s390x-linux-gnu-O3 with
build-many-glibcs.py using GCC mainline.

Correct the attribute.  Fixing this shows up that some calls to
memfrob in elf/ tests are reading uninitialized memory; I'm not
entirely sure of the purpose of those calls, but guess they are about
ensuring that the stack space is indeed allocated at that point in the
function, and so it matters that they are calling a function whose
semantics are unknown to the compiler.  Thus, change the first memfrob
call in those tests to use explicit_bzero instead, as suggested by
Florian in
<https://sourceware.org/pipermail/libc-alpha/2021-October/132119.html>,
to avoid the use of uninitialized memory.

Tested for x86_64, and with build-many-glibcs.py (GCC mainline) for
s390x-linux-gnu-O3.
This commit is contained in:
Joseph Myers 2021-10-20 13:38:50 +00:00
parent ad6f2a010c
commit 2c6cabb3a4
4 changed files with 4 additions and 4 deletions

View File

@ -26,7 +26,7 @@ static void
deeper (void (*f) (void)) deeper (void (*f) (void))
{ {
char stack[1100 * 1024]; char stack[1100 * 1024];
memfrob (stack, sizeof stack); explicit_bzero (stack, sizeof stack);
(*f) (); (*f) ();
memfrob (stack, sizeof stack); memfrob (stack, sizeof stack);
} }

View File

@ -25,7 +25,7 @@ static void
deeper (void (*f) (void)) deeper (void (*f) (void))
{ {
char stack[1100 * 1024]; char stack[1100 * 1024];
memfrob (stack, sizeof stack); explicit_bzero (stack, sizeof stack);
(*f) (); (*f) ();
memfrob (stack, sizeof stack); memfrob (stack, sizeof stack);
} }

View File

@ -227,7 +227,7 @@ static void
deeper (void (*f) (void)) deeper (void (*f) (void))
{ {
char stack[1100 * 1024]; char stack[1100 * 1024];
memfrob (stack, sizeof stack); explicit_bzero (stack, sizeof stack);
(*f) (); (*f) ();
memfrob (stack, sizeof stack); memfrob (stack, sizeof stack);
} }

View File

@ -495,7 +495,7 @@ extern char *strfry (char *__string) __THROW __nonnull ((1));
/* Frobnicate N bytes of S. */ /* Frobnicate N bytes of S. */
extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1)) extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1))
__attr_access ((__write_only__, 1, 2)); __attr_access ((__read_write__, 1, 2));
# ifndef basename # ifndef basename
/* Return the file name within directory of FILENAME. We don't /* Return the file name within directory of FILENAME. We don't