diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2024-07-24 14:05:13 -0700 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-08-01 14:41:48 +0200 |
| commit | 0301637b9931766ee389aedf3899cde756b37283 (patch) | |
| tree | 01c3a80a35483affda0bbc460e40bbef4bf3adf7 | |
| parent | 1bed6acf50f6fdedf5a501cbd6a8225e5c13b886 (diff) | |
| download | glibc-0301637b9931766ee389aedf3899cde756b37283.zip glibc-0301637b9931766ee389aedf3899cde756b37283.tar.gz glibc-0301637b9931766ee389aedf3899cde756b37283.tar.bz2 | |
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)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mremap.c | 14 |
2 files changed, 14 insertions, 1 deletions
@@ -55,6 +55,7 @@ The following bugs are resolved with this release: [31476] resolv: Track single-request fallback via _res._flags [31890] resolv: Allow short error responses to match any DNS query [31965] rseq extension mechanism does not work as intended + [31968] mremap implementation in C does not handle arguments correctly Version 2.38 diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c index 0ad5da8..05ed8fe 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 *); |