From 29ecbe76e4cb1ea69a8c860f6f3556f0b2d95ca4 Mon Sep 17 00:00:00 2001 From: "@ran-zhao-yu" Date: Wed, 5 Mar 2025 14:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=A5=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @ran-zhao-yu --- Fix-CVE-2024-56171.patch | 41 +++++++++++++++++++++++++++++ Fix-CVE-2025-24928.patch | 56 ++++++++++++++++++++++++++++++++++++++++ Fix-CVE-2025-27113.patch | 31 ++++++++++++++++++++++ install.py | 5 +++- 4 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 Fix-CVE-2024-56171.patch create mode 100644 Fix-CVE-2025-24928.patch create mode 100644 Fix-CVE-2025-27113.patch diff --git a/Fix-CVE-2024-56171.patch b/Fix-CVE-2024-56171.patch new file mode 100644 index 0000000..320a579 --- /dev/null +++ b/Fix-CVE-2024-56171.patch @@ -0,0 +1,41 @@ +From 5880a9a6bd97c0f9ac8fc4f30110fe023f484746 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 10 Dec 2024 16:52:05 +0100 +Subject: [PATCH] [CVE-2024-56171] Fix use-after-free after + xmlSchemaItemListAdd + +xmlSchemaItemListAdd can reallocate the items array. Update local +variables after adding item in + +- xmlSchemaIDCFillNodeTables +- xmlSchemaBubbleIDCNodeTables + +Fixes #828. +--- + xmlschemas.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 1b3c524f2..95be97c96 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -23374,6 +23374,7 @@ xmlSchemaIDCFillNodeTables(xmlSchemaValidCtxtPtr vctxt, + } + if (xmlSchemaItemListAdd(bind->dupls, bind->nodeTable[j]) == -1) + goto internal_error; ++ dupls = (xmlSchemaPSVIIDCNodePtr *) bind->dupls->items; + /* + * Remove the duplicate entry from the IDC node-table. + */ +@@ -23590,6 +23591,8 @@ xmlSchemaBubbleIDCNodeTables(xmlSchemaValidCtxtPtr vctxt) + goto internal_error; + } + xmlSchemaItemListAdd(parBind->dupls, parNode); ++ dupls = (xmlSchemaPSVIIDCNodePtr *) ++ parBind->dupls->items; + } else { + /* + * Add the node-table entry (node and key-sequence) of +-- +GitLab + diff --git a/Fix-CVE-2025-24928.patch b/Fix-CVE-2025-24928.patch new file mode 100644 index 0000000..7e38b31 --- /dev/null +++ b/Fix-CVE-2025-24928.patch @@ -0,0 +1,56 @@ +From 8c8753ad5280ee13aee5eec9b0f6eee2ed920f57 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 11 Feb 2025 17:30:40 +0100 +Subject: [PATCH] [CVE-2025-24928] Fix stack-buffer-overflow in + xmlSnprintfElements + +Fixes #847. +--- + valid.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/valid.c b/valid.c +index d63137fa0..6a8ae1fb4 100644 +--- a/valid.c ++++ b/valid.c +@@ -4997,26 +4997,26 @@ xmlSnprintfElements(char *buf, int size, xmlNodePtr node, int glob) { + return; + } + switch (cur->type) { +- case XML_ELEMENT_NODE: ++ case XML_ELEMENT_NODE: { ++ int qnameLen = xmlStrlen(cur->name); ++ ++ if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) ++ qnameLen += xmlStrlen(cur->ns->prefix) + 1; ++ if (size - len < qnameLen + 10) { ++ if ((size - len > 4) && (buf[len - 1] != '.')) ++ strcat(buf, " ..."); ++ return; ++ } + if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) { +- if (size - len < xmlStrlen(cur->ns->prefix) + 10) { +- if ((size - len > 4) && (buf[len - 1] != '.')) +- strcat(buf, " ..."); +- return; +- } + strcat(buf, (char *) cur->ns->prefix); + strcat(buf, ":"); + } +- if (size - len < xmlStrlen(cur->name) + 10) { +- if ((size - len > 4) && (buf[len - 1] != '.')) +- strcat(buf, " ..."); +- return; +- } + if (cur->name != NULL) + strcat(buf, (char *) cur->name); + if (cur->next != NULL) + strcat(buf, " "); + break; ++ } + case XML_TEXT_NODE: + if (xmlIsBlankNode(cur)) + break; +-- +GitLab + diff --git a/Fix-CVE-2025-27113.patch b/Fix-CVE-2025-27113.patch new file mode 100644 index 0000000..3602af6 --- /dev/null +++ b/Fix-CVE-2025-27113.patch @@ -0,0 +1,31 @@ +From 6c716d491dd2e67f08066f4dc0619efeb49e43e6 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Thu, 13 Feb 2025 16:48:53 +0100 +Subject: [PATCH] pattern: Fix compilation of explicit child axis + +The child axis is the default axis and should generate XML_OP_ELEM like +the case without an axis. +--- + pattern.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pattern.c b/pattern.c +index 0877fc1a0..6fa88f759 100644 +--- a/pattern.c ++++ b/pattern.c +@@ -1035,10 +1035,10 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { + goto error; + } + } else { +- PUSH(XML_OP_CHILD, token, URL); ++ PUSH(XML_OP_ELEM, token, URL); + } + } else +- PUSH(XML_OP_CHILD, name, NULL); ++ PUSH(XML_OP_ELEM, name, NULL); + return; + } else if (xmlStrEqual(name, (const xmlChar *) "attribute")) { + XML_PAT_FREE_STRING(ctxt, name) +-- +GitLab + diff --git a/install.py b/install.py index 078f04a..9fdb839 100755 --- a/install.py +++ b/install.py @@ -230,7 +230,10 @@ def do_patch(args, target_dir): "backport-xpath-Ignore-entity-ref-nodes-when-computing-node-ha.patch", "backport-SAX-Always-initialize-SAX1-element-handlers.patch", "Fix-malloc-fail.patch", - "Fix-CVE-2024-34459.patch" + "Fix-CVE-2024-34459.patch", + "Fix-CVE-2024-56171.patch", + "Fix-CVE-2025-24928.patch", + "Fix-CVE-2025-27113.patch" ] for patch in patch_file: -- Gitee