diff options
| author | Peter Marko <peter.marko@siemens.com> | 2026-01-25 19:35:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2026-02-16 09:52:35 +0000 |
| commit | bd21ac68d0a8403e2a7675c5d90ac1b4889de2a4 (patch) | |
| tree | 4405065dc8eed8b8089e1762c89aecf94fb89ded /meta/recipes-core | |
| parent | 57126cdaa7b17c58bdbcca9cca62ff73080d86e1 (diff) | |
| download | poky-bd21ac68d0a8403e2a7675c5d90ac1b4889de2a4.tar.gz | |
libxml2: patch CVE-2026-0992
Pick patch which closed [1].
Adapt for missing xmlCatalogPrintDebug per [2].
[1] https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019
[2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/728869809eb7eee1b1681d558b4b506a8019c151
(From OE-Core rev: 826dd15a99433c4066d2cd4546515d174d443350)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch | 49 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2_2.12.10.bb | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch b/meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch new file mode 100644 index 0000000000..b335dafb63 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From f75abfcaa419a740a3191e56c60400f3ff18988d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Garcia Moreno <daniel.garcia@suse.com> | ||
| 3 | Date: Fri, 19 Dec 2025 11:02:18 +0100 | ||
| 4 | Subject: [PATCH] catalog: Ignore repeated nextCatalog entries | ||
| 5 | |||
| 6 | This patch makes the catalog parsing to ignore repeated entries of | ||
| 7 | nextCatalog with the same value. | ||
| 8 | |||
| 9 | Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019 | ||
| 10 | |||
| 11 | CVE: CVE-2026-0989 | ||
| 12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/f75abfcaa419a740a3191e56c60400f3ff18988d] | ||
| 13 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 14 | --- | ||
| 15 | catalog.c | 18 ++++++++++++++++++ | ||
| 16 | 1 file changed, 18 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/catalog.c b/catalog.c | ||
| 19 | index 46b877e6..fa6d77ca 100644 | ||
| 20 | --- a/catalog.c | ||
| 21 | +++ b/catalog.c | ||
| 22 | @@ -1266,9 +1266,27 @@ xmlParseXMLCatalogNode(xmlNodePtr cur, xmlCatalogPrefer prefer, | ||
| 23 | BAD_CAST "delegateURI", BAD_CAST "uriStartString", | ||
| 24 | BAD_CAST "catalog", prefer, cgroup); | ||
| 25 | } else if (xmlStrEqual(cur->name, BAD_CAST "nextCatalog")) { | ||
| 26 | + xmlCatalogEntryPtr prev = parent->children; | ||
| 27 | + | ||
| 28 | entry = xmlParseXMLCatalogOneNode(cur, XML_CATA_NEXT_CATALOG, | ||
| 29 | BAD_CAST "nextCatalog", NULL, | ||
| 30 | BAD_CAST "catalog", prefer, cgroup); | ||
| 31 | + /* Avoid duplication of nextCatalog */ | ||
| 32 | + while (prev != NULL) { | ||
| 33 | + if ((prev->type == XML_CATA_NEXT_CATALOG) && | ||
| 34 | + (xmlStrEqual (prev->URL, entry->URL)) && | ||
| 35 | + (xmlStrEqual (prev->value, entry->value)) && | ||
| 36 | + (prev->prefer == entry->prefer) && | ||
| 37 | + (prev->group == entry->group)) { | ||
| 38 | + if (xmlDebugCatalogs) | ||
| 39 | + fprintf(stderr, | ||
| 40 | + "Ignoring repeated nextCatalog %s\n", entry->URL); | ||
| 41 | + xmlFreeCatalogEntry(entry, NULL); | ||
| 42 | + entry = NULL; | ||
| 43 | + break; | ||
| 44 | + } | ||
| 45 | + prev = prev->next; | ||
| 46 | + } | ||
| 47 | } | ||
| 48 | if (entry != NULL) { | ||
| 49 | if (parent != NULL) { | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.12.10.bb b/meta/recipes-core/libxml/libxml2_2.12.10.bb index 6a03fc3f6c..fa081c2382 100644 --- a/meta/recipes-core/libxml/libxml2_2.12.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.10.bb | |||
| @@ -27,6 +27,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt | |||
| 27 | file://CVE-2025-7425.patch \ | 27 | file://CVE-2025-7425.patch \ |
| 28 | file://CVE-2026-0989.patch \ | 28 | file://CVE-2026-0989.patch \ |
| 29 | file://CVE-2026-0990.patch \ | 29 | file://CVE-2026-0990.patch \ |
| 30 | file://CVE-2026-0992.patch \ | ||
| 30 | " | 31 | " |
| 31 | 32 | ||
| 32 | SRC_URI[archive.sha256sum] = "c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995" | 33 | SRC_URI[archive.sha256sum] = "c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995" |
