diff options
| author | Peter Marko <peter.marko@siemens.com> | 2025-04-27 18:13:02 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-05-02 08:20:11 -0700 |
| commit | 0396fbd2d992a96be99892acdd4207a731ae7e98 (patch) | |
| tree | 461f199f93885b4cb66b9f93e0799e07bb8ffa05 | |
| parent | 02c6da2ecf956a516786743cec73d50579230e79 (diff) | |
| download | poky-0396fbd2d992a96be99892acdd4207a731ae7e98.tar.gz | |
libxml2: patch CVE-2025-32415
Pick commit from 2.13 branch as 2.12 branch is unmaintained now.
(From OE-Core rev: 2335d4f0d1826647eaee224c469331980fc84ed2)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2025-32415.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2_2.12.10.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2025-32415.patch b/meta/recipes-core/libxml/libxml2/CVE-2025-32415.patch new file mode 100644 index 0000000000..d8ff654a23 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2025-32415.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 384cc7c182fc00c6d5e2ab4b5e3671b2e3f93c84 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nick Wellnhofer <wellnhofer@aevum.de> | ||
| 3 | Date: Sun, 6 Apr 2025 12:41:11 +0200 | ||
| 4 | Subject: [PATCH] [CVE-2025-32415] schemas: Fix heap buffer overflow in | ||
| 5 | xmlSchemaIDCFillNodeTables | ||
| 6 | |||
| 7 | Don't use local variable which could contain a stale value. | ||
| 8 | |||
| 9 | Fixes #890. | ||
| 10 | |||
| 11 | CVE: CVE-2025-32415 | ||
| 12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/384cc7c182fc00c6d5e2ab4b5e3671b2e3f93c84] | ||
| 13 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 14 | --- | ||
| 15 | xmlschemas.c | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/xmlschemas.c b/xmlschemas.c | ||
| 19 | index 28b14bd4..428e3c82 100644 | ||
| 20 | --- a/xmlschemas.c | ||
| 21 | +++ b/xmlschemas.c | ||
| 22 | @@ -23324,7 +23324,7 @@ xmlSchemaIDCFillNodeTables(xmlSchemaValidCtxtPtr vctxt, | ||
| 23 | j++; | ||
| 24 | } while (j < nbDupls); | ||
| 25 | } | ||
| 26 | - if (nbNodeTable) { | ||
| 27 | + if (bind->nbNodes) { | ||
| 28 | j = 0; | ||
| 29 | do { | ||
| 30 | if (nbFields == 1) { | ||
| 31 | @@ -23375,7 +23375,7 @@ xmlSchemaIDCFillNodeTables(xmlSchemaValidCtxtPtr vctxt, | ||
| 32 | |||
| 33 | next_node_table_entry: | ||
| 34 | j++; | ||
| 35 | - } while (j < nbNodeTable); | ||
| 36 | + } while (j < bind->nbNodes); | ||
| 37 | } | ||
| 38 | /* | ||
| 39 | * If everything is fine, then add the IDC target-node to | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.12.10.bb b/meta/recipes-core/libxml/libxml2_2.12.10.bb index 42672e35bd..2eea65732b 100644 --- a/meta/recipes-core/libxml/libxml2_2.12.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.10.bb | |||
| @@ -19,6 +19,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt | |||
| 19 | file://run-ptest \ | 19 | file://run-ptest \ |
| 20 | file://install-tests.patch \ | 20 | file://install-tests.patch \ |
| 21 | file://CVE-2025-32414.patch \ | 21 | file://CVE-2025-32414.patch \ |
| 22 | file://CVE-2025-32415.patch \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | SRC_URI[archive.sha256sum] = "c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995" | 25 | SRC_URI[archive.sha256sum] = "c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995" |
