Add MMAP_ABOVE4G from Linux 6.6 to sys/mman.h

Resolves: RHEL-39006
This commit is contained in:
DJ Delorie 2024-05-29 15:11:09 -04:00
parent ed2fe1a5b0
commit 6640587883
2 changed files with 31 additions and 1 deletions

26
glibc-RHEL-39006.patch Normal file
View File

@ -0,0 +1,26 @@
From cb8c78b2ffa0b77ae453b2d328d7e2fe5186ef2a Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue, 31 Oct 2023 13:32:35 -0300
Subject: linux: Add MMAP_ABOVE4G from Linux 6.6 to sys/mman.h
x86 added the flag (29f890d1050fc099f) for CET enabled.
Also update tst-mman-consts.py test.
Conflicts:
sysdeps/unix/sysv/linux/tst-mman-consts.py
(removed patch to keep alerting about kernel differences)
sysdeps/unix/sysv/linux/x86/bits/mman.h
(adapted to missing __USE_MISC conditional upstream)
diff -rup a/sysdeps/unix/sysv/linux/x86/bits/mman.h b/sysdeps/unix/sysv/linux/x86/bits/mman.h
--- a/sysdeps/unix/sysv/linux/x86/bits/mman.h 2021-08-01 21:33:43.000000000 -0400
+++ b/sysdeps/unix/sysv/linux/x86/bits/mman.h 2024-05-29 14:03:12.426182715 -0400
@@ -26,6 +26,7 @@
/* Other flags. */
#ifdef __USE_MISC
# define MAP_32BIT 0x40 /* Only give out 32-bit addresses. */
+# define MAP_ABOVE4G 0x80 /* Only map above 4GB. */
#endif
#include <bits/mman-map-flags-generic.h>

View File

@ -155,7 +155,7 @@ end \
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 106%{?dist} Release: 107%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -819,6 +819,7 @@ Patch582: glibc-RHEL-25531-4.patch
Patch583: glibc-RHEL-25046.patch Patch583: glibc-RHEL-25046.patch
Patch584: glibc-RHEL-32681-1.patch Patch584: glibc-RHEL-32681-1.patch
Patch585: glibc-RHEL-32681-2.patch Patch585: glibc-RHEL-32681-2.patch
Patch586: glibc-RHEL-39006.patch
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
@ -2977,6 +2978,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %changelog
* Tue May 28 2024 <dj@redhat.com> - 2.34-107
- Add MMAP_ABOVE4G from Linux 6.6 to sys/mman.h (RHEL-39006)
* Sun May 19 2024 Patsy Griffin <patsy@redhat.com> - 2.34-106 * Sun May 19 2024 Patsy Griffin <patsy@redhat.com> - 2.34-106
- Improve test coverage for connect() (RHEL-32681) - Improve test coverage for connect() (RHEL-32681)