2a30b8f4b2
Upstream commit: dcaf51b41e259387602774829c45222d0507f90a - elf: Change ldconfig auxcache magic number (bug 32231) - Make tst-strtod-underflow type-generic - Add crt1-2.0.o for glibc 2.0 compatibility tests - Add tests of more strtod special cases - Add more tests of strtod end pointer - Make tst-strtod2 and tst-strtod5 type-generic - powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) - Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) - Improve NaN payload testing - Make __strtod_internal tests type-generic - Fix strtod subnormal rounding (bug 30220) - More thoroughly test underflow / errno in tst-strtod-round - Test errno setting on strtod overflow in tst-strtod-round - Add tests of fread - stdio-common: Add new test for fdopen - libio: Attempt wide backup free only for non-legacy code - debug: Fix read error handling in pcprofiledump - elf: Fix tst-dlopen-tlsreinit1.out test dependency - elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) - elf: Clarify and invert second argument of _dl_allocate_tls_init - elf: Support recursive use of dynamic TLS in interposed malloc - nptl: Use <support/check.h> facilities in tst-setuid3 - posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64 - ungetc: Fix backup buffer leak on program exit [BZ #27821] - ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] - Make tst-ungetc use libsupport - stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] - support: Add FAIL test failure helper - string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) - Define __libc_initial for the static libc - x86: Fix bug in strchrnul-evex512 [BZ #32078] - Adjust check-local-headers test for libaudit 4.0 - x32/cet: Support shadow stack during startup for Linux 6.10 - x86-64: Remove sysdeps/x86_64/x32/dl-machine.h - support: Add options list terminator to the test driver - manual/stdio: Further clarify putc, putwc, getc, and getwc - Fix name space violation in fortify wrappers (bug 32052) - resolv: Fix tst-resolv-short-response for older GCC (bug 32042) - Add mremap tests - mremap: Update manual entry - linux: Update the mremap C implementation [BZ #31968] - Enhanced test coverage for strncmp, wcsncmp - Enhance test coverage for strnlen, wcsnlen Resolves: RHEL-57776 Resolves: RHEL-57777 Resolves: RHEL-61392
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
commit 9f349d02c6065f77b485526b3d76a637f6f079dc
|
|
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
Date: Wed Jul 24 14:05:13 2024 -0700
|
|
|
|
linux: Update the mremap C implementation [BZ #31968]
|
|
|
|
Update the mremap C implementation to support the optional argument for
|
|
MREMAP_DONTUNMAP added in Linux 5.7 since it may not always be correct
|
|
to implement a variadic function as a non-variadic function on all Linux
|
|
targets. Return MAP_FAILED and set errno to EINVAL for unknown flag bits.
|
|
This fixes BZ #31968.
|
|
|
|
Note: A test must be added when a new flag bit is introduced.
|
|
|
|
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit 6c40cb0e9f893d49dc7caee580a055de53562206)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c
|
|
index 4f770799c4f2fd18..1ada5c1f40dec1f6 100644
|
|
--- a/sysdeps/unix/sysv/linux/mremap.c
|
|
+++ b/sysdeps/unix/sysv/linux/mremap.c
|
|
@@ -20,6 +20,12 @@
|
|
#include <sysdep.h>
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
+#include <errno.h>
|
|
+
|
|
+#define MREMAP_KNOWN_BITS \
|
|
+ (MREMAP_MAYMOVE \
|
|
+ | MREMAP_FIXED \
|
|
+ | MREMAP_DONTUNMAP)
|
|
|
|
void *
|
|
__mremap (void *addr, size_t old_len, size_t new_len, int flags, ...)
|
|
@@ -27,7 +33,13 @@ __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...)
|
|
va_list va;
|
|
void *new_addr = NULL;
|
|
|
|
- if (flags & MREMAP_FIXED)
|
|
+ if (flags & ~(MREMAP_KNOWN_BITS))
|
|
+ {
|
|
+ __set_errno (EINVAL);
|
|
+ return MAP_FAILED;
|
|
+ }
|
|
+
|
|
+ if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP))
|
|
{
|
|
va_start (va, flags);
|
|
new_addr = va_arg (va, void *);
|