mirror of
https://git.yoctoproject.org/poky
synced 2026-02-13 04:03:03 +01:00
f765c28fb3
Pick commit from 2.12 branch. (From OE-Core rev: ab804cd27ecf7ee65a9feea477140502ecbc0d73) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 245b70d7d2768572ae1b05b3668ca858b9ec4ed4 Mon Sep 17 00:00:00 2001
|
|
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
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.
|
|
|
|
CVE: CVE-2024-56171
|
|
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/245b70d7d2768572ae1b05b3668ca858b9ec4ed4]
|
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
|
---
|
|
xmlschemas.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/xmlschemas.c b/xmlschemas.c
|
|
index a089ebc5..18e35e75 100644
|
|
--- a/xmlschemas.c
|
|
+++ b/xmlschemas.c
|
|
@@ -23647,6 +23647,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.
|
|
*/
|
|
@@ -23863,6 +23864,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
|