AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: Update the mremap C implementation [BZ #31968]

Browse Source 
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 6c40cb0e9f)
This commit is contained in:
H.J. Lu 2024-07-24 14:05:13 -07:00 committed by Florian Weimer
parent 46f19b2342
commit 3433a35842
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -11,6 +11,7 @@ The following bugs are resolved with this release:
[30081] resolv: Do not wait for non-existing second DNS response after error
[31890] resolv: Allow short error responses to match any DNS query
[31968] mremap implementation in C does not handle arguments correctly
Version 2.40

14
sysdeps/unix/sysv/linux/mremap.c
View File

@ -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 *);