glibc: Fix CVE-2026-6238
PATCH v2 1/1 glibc: Fix CVE-2026-6238
From: Deepesh Varatharajan <[email protected]>
Backport six commits from upstream glibc to fix CVE-2026-6238.
4ba0b79b95 resolv: Add test case tst-ns_sprintrr (bug 34033, bug 34069) a7b60d23bb resolv: Fix buffer overreads in ns_sprintrrf (CVE-2026-6238) cd0db208d5 resolv: Check for inet_ntop failure in ns_sprintrrf d58415eb17 resolv: Improve formatting of unknown records in ns_sprintrrf f69b7f95e3 resolv: Fix ns_sprintrrf formatting of class, type values (bug 34289) 360f352c9a resolv: Declare __p_class_syms, __p_type_syms for internal use
The upstream patch series [PATCH 0/5] contains five commits:
1/5: Update GLIBC-SA-2026-0012 to mention A6 records (doc only) 2/5: resolv: Check for inet_ntop failure in ns_sprintrrf 3/5: resolv: Remove incorrect parts of TSIG handling from ns_sprintrrf
(CVE-2026-5435)
4/5: resolv: Fix buffer overreads in ns_sprintrrf (CVE-2026-6238) 5/5: resolv: Add test case tst-ns_sprintrr (bug 34033, bug 34069)
For this backport:
- Patch 1/5 is skipped (documentation-only change to advisories, upstream glibc itself does not backport this to older releases)
- Patch 3/5 (CVE-2026-5435) is already patched in scarthgap sources
- Patches 2/5, 4/5, and 5/5 are backported as:
0028-CVE-2026-6238-0004.patch (inet_ntop failure check) 0029-CVE-2026-6238-0005.patch (buffer overread fix - CVE-2026-6238) 0030-CVE-2026-6238-0006.patch (test case for bug 34033, bug 34069)
However, the test case (tst-ns_sprintrr) from patch 5/5 failed on scarthgap's glibc 2.39 due to missing prerequisite commits. Three additional patches were backported to resolve the test failure:
0025-CVE-2026-6238-0001.patch (Declare __p_class_syms, __p_type_syms for internal) 0026-CVE-2026-6238-0002.patch (Fix ns_sprintrrf formatting of class, type values) 0027-CVE-2026-6238-0003.patch (Improve formatting of unknown records in ns_sprintrrf)
CVE-2026-6238 fixes buffer overreads in ns_sprintrrf affecting A6 and LOC record handling. The vulnerable LOC record handling was introduced before glibc 2.0, while A6 record handling was added in glibc 2.7.
Reference:
https://inbox.sourceware.org/libc-alpha/[email protected]/
https://nvd.nist.gov/vuln/detail/CVE-2026-6238
https://sourceware.org/bugzilla/show_bug.cgi?id=34069
Testing Results:
Before After Diff PASS 4896 4897 +1 XPASS 4 4 0 FAIL 372 372 0 XFAIL 16 16 0 UNSUPPORTED 224 224 0
Changes in testcases:
testcase-name before after
resolv/tst-ns_sprintrr(new) - PASS
commit - 4ba0b79b95 resolv: Add test case tst-ns_sprintrr (bug 34033, bug 34069) +PASS: resolv/tst-ns_sprintrr
--- .../glibc/glibc/0025-CVE-2026-6238-0001.patch | 59 +++ .../glibc/glibc/0026-CVE-2026-6238-0002.patch | 81 ++++ .../glibc/glibc/0027-CVE-2026-6238-0003.patch | 58 +++ .../glibc/glibc/0028-CVE-2026-6238-0004.patch | 73 ++++ .../glibc/glibc/0029-CVE-2026-6238-0005.patch | 69 ++++ .../glibc/glibc/0030-CVE-2026-6238-0006.patch | 382 ++++++++++++++++++ meta/recipes-core/glibc/glibc_2.39.bb | 6 + 7 files changed, 728 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/0025-CVE-2026-6238-0001.patch create mode 100644 meta/recipes-core/glibc/glibc/0026-CVE-2026-6238-0002.patch create mode 100644 meta/recipes-core/glibc/glibc/0027-CVE-2026-6238-0003.patch create mode 100644 meta/recipes-core/glibc/glibc/0028-CVE-2026-6238-0004.patch create mode 100644 meta/recipes-core/glibc/glibc/0029-CVE-2026-6238-0005.patch create mode 100644 meta/recipes-core/glibc/glibc/0030-CVE-2026-6238-0006.patch
meta/recipes-core/glibc/glibc/0025-CVE-2026-6238-0001.patch new file +59 -0
@@ -0,0 +1,59 @@ +From 360f352c9a6da545d798ef3015e73ca114f0d230 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <[email protected]> +Date: Fri, 19 Jun 2026 18:22:20 +0200 +Subject: [PATCH] resolv: Declare __p_class_syms, __p_type_syms for internal + use + +Reviewed-by: Carlos O'Donell <[email protected]> +Reviewed-by: Adhemerval Zanella <[email protected]> + +CVE: CVE-2026-6238 +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=patch;h=360f352c9a6da545d798ef3015e73ca114f0d230] + +Signed-off-by: Deepesh Varatharajan <[email protected]> +--- + include/resolv.h | 5 +++++ + resolv/res_debug.c | 4 ---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/include/resolv.h b/include/resolv.h +index 4dbbac38..d5ad9994 100644 +--- a/include/resolv.h ++++ b/include/resolv.h +@@ -70,6 +70,11 @@ libc_hidden_proto (__libc_res_nameinquery) + extern __typeof (__res_queriesmatch) __libc_res_queriesmatch; + libc_hidden_proto (__libc_res_queriesmatch) + ++extern const struct res_sym __p_class_syms[]; ++libresolv_hidden_proto (__p_class_syms) ++extern const struct res_sym __p_type_syms[]; ++libresolv_hidden_proto (__p_type_syms) ++ + /* Variant of res_hnok which operates on binary (but uncompressed) names. */ + bool __res_binary_hnok (const unsigned char *dn) attribute_hidden; + +diff --git a/resolv/res_debug.c b/resolv/res_debug.c +index dab5283b..6f03e414 100644 +--- a/resolv/res_debug.c ++++ b/resolv/res_debug.c +@@ -389,8 +389,6 @@ p_fqname(const u_char *cp, const u_char *msg, FILE *file) { + * that C_ANY is a qclass but not a class. (You can ask for records of class + * C_ANY, but you can't have any records of that class in the database.) + */ +-extern const struct res_sym __p_class_syms[]; +-libresolv_hidden_proto (__p_class_syms) + const struct res_sym __p_class_syms[] = { + {C_IN, (char *) "IN"}, + {C_CHAOS, (char *) "CHAOS"}, +@@ -425,8 +423,6 @@ const struct res_sym __p_update_section_syms[] attribute_hidden = { + * Names of RR types and qtypes. The list is incomplete because its + * size is part of the ABI. + */ +-extern const struct res_sym __p_type_syms[]; +-libresolv_hidden_proto (__p_type_syms) + const struct res_sym __p_type_syms[] = { + {ns_t_a, (char *) "A", (char *) "address"}, + {ns_t_ns, (char *) "NS", (char *) "name server"}, +-- +2.49.0 +
meta/recipes-core/glibc/glibc/0026-CVE-2026-6238-0002.patch new file +81 -0
81 lines not on this page · raw message
meta/recipes-core/glibc/glibc/0027-CVE-2026-6238-0003.patch new file +58 -0
58 lines not on this page · raw message
meta/recipes-core/glibc/glibc/0028-CVE-2026-6238-0004.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-core/glibc/glibc/0029-CVE-2026-6238-0005.patch new file +69 -0
69 lines not on this page · raw message
meta/recipes-core/glibc/glibc/0030-CVE-2026-6238-0006.patch new file +382 -0
382 lines not on this page · raw message
meta/recipes-core/glibc/glibc_2.39.bb +6 -0
@@ -57,6 +57,12 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0023-qemu-stale-process.patch \ file://0001-stdlib-Add-single-threaded-fast-path-to-rand.patch \ file://0024-CVE-2026-5435.patch \ + file://0025-CVE-2026-6238-0001.patch \ + file://0026-CVE-2026-6238-0002.patch \ + file://0027-CVE-2026-6238-0003.patch \ + file://0028-CVE-2026-6238-0004.patch \ + file://0029-CVE-2026-6238-0005.patch \ + file://0030-CVE-2026-6238-0006.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}"
Signature · 1 line
2.49.0