summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glibc/glibc-version.inc2
-rw-r--r--meta/recipes-core/glibc/glibc/0025-CVE-2025-4802.patch3
-rw-r--r--meta/recipes-core/glibc/glibc_2.35.bb2
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc
index 34b199c02b..b269518af4 100644
--- a/meta/recipes-core/glibc/glibc-version.inc
+++ b/meta/recipes-core/glibc/glibc-version.inc
@@ -1,6 +1,6 @@
1SRCBRANCH ?= "release/2.35/master" 1SRCBRANCH ?= "release/2.35/master"
2PV = "2.35" 2PV = "2.35"
3SRCREV_glibc ?= "d2febe7c407665c18cfea1930c65f41899ab3aa3" 3SRCREV_glibc ?= "80401002011f470d9c6eb604bf734715e9b3a8c2"
4SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87" 4SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87"
5 5
6GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 6GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
diff --git a/meta/recipes-core/glibc/glibc/0025-CVE-2025-4802.patch b/meta/recipes-core/glibc/glibc/0025-CVE-2025-4802.patch
index 0298f5a865..a1197c0318 100644
--- a/meta/recipes-core/glibc/glibc/0025-CVE-2025-4802.patch
+++ b/meta/recipes-core/glibc/glibc/0025-CVE-2025-4802.patch
@@ -81,7 +81,7 @@ index 09079c12..c2baed69 100644
81- NULL, NULL); 81- NULL, NULL);
82- 82-
83- /* Remember the last search directory added at startup. */ 83- /* Remember the last search directory added at startup. */
84- _dl_init_all_dirs = GL(dl_all_dirs); 84_dl_verbose = *(getenv ("LD_WARN") ?: "") == '\0' ? 0 : 1;- _dl_init_all_dirs = GL(dl_all_dirs);
85- 85-
86- _dl_lazy = *(getenv ("LD_BIND_NOW") ?: "") == '\0'; 86- _dl_lazy = *(getenv ("LD_BIND_NOW") ?: "") == '\0';
87- 87-
@@ -97,6 +97,7 @@ index 09079c12..c2baed69 100644
97 if (__libc_enable_secure) 97 if (__libc_enable_secure)
98 { 98 {
99 static const char unsecure_envvars[] = 99 static const char unsecure_envvars[] =
100 setup_vdso_pointers ();
100@@ -324,6 +301,29 @@ _dl_non_dynamic_init (void) 101@@ -324,6 +301,29 @@ _dl_non_dynamic_init (void)
101 #endif 102 #endif
102 } 103 }
diff --git a/meta/recipes-core/glibc/glibc_2.35.bb b/meta/recipes-core/glibc/glibc_2.35.bb
index 3023e9c1ed..df5f14984a 100644
--- a/meta/recipes-core/glibc/glibc_2.35.bb
+++ b/meta/recipes-core/glibc/glibc_2.35.bb
@@ -27,6 +27,7 @@ CVE_CHECK_IGNORE += "CVE-2023-4527"
27CVE_CHECK_IGNORE += " \ 27CVE_CHECK_IGNORE += " \
28 CVE-2023-0687 CVE-2023-4813 CVE-2023-4806 CVE-2023-4911 CVE-2023-5156 \ 28 CVE-2023-0687 CVE-2023-4813 CVE-2023-4806 CVE-2023-4911 CVE-2023-5156 \
29 CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 \ 29 CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 \
30 CVE-2025-4802 \
30" 31"
31 32
32DEPENDS += "gperf-native bison-native" 33DEPENDS += "gperf-native bison-native"
@@ -61,7 +62,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
61 file://0022-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch \ 62 file://0022-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch \
62 file://0023-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ 63 file://0023-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \
63 file://0024-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ 64 file://0024-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
64 file://0025-CVE-2025-4802.patch \
65 file://0026-PR25847-1.patch \ 65 file://0026-PR25847-1.patch \
66 file://0026-PR25847-2.patch \ 66 file://0026-PR25847-2.patch \
67 file://0026-PR25847-3.patch \ 67 file://0026-PR25847-3.patch \