Skip to contentSkip to conversation

python3: fix CVE-2026-7210

PATCH Superseded [email protected] 1 participant 1 message Jun 4

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python3: fix CVE-2026-7210

From: Amaury Couderc <[email protected]>

Backport patch to fix CVE-2026-7210.
https://nvd.nist.gov/vuln/detail/CVE-2026-7210

Upstream fixes:
https://github.com/python/cpython/pull/149023/commits/03794ce9a58b1f33751c88d7d876dfbf27645c56
https://github.com/python/cpython/pull/149023/commits/ccb8d2f7df9534e49a43554193d7f5f4d993189c

---
 .../python/python3/CVE-2026-7210-1.patch      | 88 +++++++++++++++++++
 .../python/python3/CVE-2026-7210-2.patch      | 74 ++++++++++++++++
 .../python/python3_3.12.13.bb                 |  2 +
 3 files changed, 164 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3/CVE-2026-7210-1.patch
 create mode 100644 meta/recipes-devtools/python/python3/CVE-2026-7210-2.patch
meta/recipes-devtools/python/python3/CVE-2026-7210-1.patch new file +88 -0
new file mode 100644
index 0000000000..23d412cc38
@@ -0,0 +1,88 @@
+From 03794ce9a58b1f33751c88d7d876dfbf27645c56 Mon Sep 17 00:00:00 2001
+From: Stan Ulbrych <[email protected]>
+Date: Sun, 26 Apr 2026 19:31:25 +0100
+Subject: [PATCH] Use `XML_SetHashSalt16Bytes` from libExpat when possible
+
+CVE: CVE-2026-7210
+Upstream-Status: Backport [https://github.com/python/cpython/pull/149023/commits/03794ce9a58b1f33751c88d7d876dfbf27645c56]
+
+Signed-off-by: Amaury Couderc <[email protected]>
+---
+ Include/pyexpat.h                                     |  3 +++
+ .../2026-04-26-19-30-45.gh-issue-149018.a9SqWb.rst   |  3 +++
+ Modules/_elementtree.c                                |  8 ++++++--
+ Modules/pyexpat.c                                     | 11 ++++++++++-
+ 4 files changed, 22 insertions(+), 3 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2026-04-26-19-30-45.gh-issue-149018.a9SqWb.rst
+
+diff --git a/Include/pyexpat.h b/Include/pyexpat.h
+index f523f8bb273983a..a676e16a7a457ea 100644
+--- a/Include/pyexpat.h
++++ b/Include/pyexpat.h
+@@ -57,6 +57,9 @@ struct PyExpat_CAPI
+         XML_Parser parser, unsigned long long activationThresholdBytes);
+     XML_Bool (*SetAllocTrackerMaximumAmplification)(
+         XML_Parser parser, float maxAmplificationFactor);
++    /* might be NULL for expat < 2.8.0 */
++    XML_Bool (*SetHashSalt16Bytes)(
++        XML_Parser parser, const uint8_t entropy[16]);
+     /* always add new stuff to the end! */
+ };
+ 
+diff --git a/Misc/NEWS.d/next/Security/2026-04-26-19-30-45.gh-issue-149018.a9SqWb.rst b/Misc/NEWS.d/next/Security/2026-04-26-19-30-45.gh-issue-149018.a9SqWb.rst
+new file mode 100644
+index 000000000000000..d1b5b368684e6a5
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2026-04-26-19-30-45.gh-issue-149018.a9SqWb.rst
+@@ -0,0 +1,3 @@
++Improved protection against XML hash-flooding attacks in
++:mod:`xml.parsers.expat` and :mod:`xml.etree.ElementTree` when Python is
++compiled with libExpat 2.8.0 or later.
+diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
+index cbd1e026df27227..b2d4b982602c583 100644
+--- a/Modules/_elementtree.c
++++ b/Modules/_elementtree.c
+@@ -3657,8 +3657,12 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target,
+         PyErr_NoMemory();
+         return -1;
+     }
+-    /* expat < 2.1.0 has no XML_SetHashSalt() */
+-    if (EXPAT(st, SetHashSalt) != NULL) {
++    // Prefer 16-byte entropy, only expat >= 2.8.0. See gh-149018
++    if (EXPAT(st, SetHashSalt16Bytes) != NULL) {
++        EXPAT(st, SetHashSalt16Bytes)(self->parser,
++                                      (const uint8_t *)_Py_HashSecret.uc);
++    }
++    else if (EXPAT(st, SetHashSalt) != NULL) {
+         EXPAT(st, SetHashSalt)(self->parser,
+                            (unsigned long)_Py_HashSecret.expat.hashsalt);
+     }
+diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
+index 0f0afe17513ef1c..1df433e64bc096f 100644
+--- a/Modules/pyexpat.c
++++ b/Modules/pyexpat.c
+@@ -1388,7 +1388,11 @@ newxmlparseobject(pyexpat_state *state, const char *encoding,
+         Py_DECREF(self);
+         return NULL;
+     }
+-#if XML_COMBINED_VERSION >= 20100
++#if XML_COMBINED_VERSION >= 20800
++    /* This feature was added upstream in libexpat 2.8.0. */
++    XML_SetHashSalt16Bytes(self->itself,
++                           (const uint8_t *)_Py_HashSecret.uc);
++#elif XML_COMBINED_VERSION >= 20100
+     /* This feature was added upstream in libexpat 2.1.0. */
+     XML_SetHashSalt(self->itself,
+                     (unsigned long)_Py_HashSecret.expat.hashsalt);
+@@ -2257,6 +2261,11 @@ pyexpat_exec(PyObject *mod)
+ #else
+     capi->SetHashSalt = NULL;
+ #endif
++#if XML_COMBINED_VERSION >= 20800
++    capi->SetHashSalt16Bytes = XML_SetHashSalt16Bytes;
++#else
++    capi->SetHashSalt16Bytes = NULL;
++#endif
+ #if XML_COMBINED_VERSION >= 20600
+     capi->SetReparseDeferralEnabled = XML_SetReparseDeferralEnabled;
+ #else
meta/recipes-devtools/python/python3/CVE-2026-7210-2.patch new file +74 -0

74 lines not on this page · raw message

meta/recipes-devtools/python/python3_3.12.13.bb +2 -0
index 5fa25235fe..236bffc360 100644
@@ -34,6 +34,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
 	   file://0001-test_deadlock-skip-problematic-test.patch \
 	   file://0001-test_active_children-skip-problematic-test.patch \
            file://0001-test_readline-skip-limited-history-test.patch \
+           file://CVE-2026-7210-1.patch \
+           file://CVE-2026-7210-2.patch \
            "
 
 SRC_URI:append:class-native = " \
Signature · 1 line
2.34.1