diff mbox series

[kirkstone,05/35] Revert "expat: backport the fix for CVE-2022-43680"

Message ID b633c648da57079c8a3b64127e5ed11643fb5438.1668952942.git.steve@sakoman.com
State Accepted, archived
Commit b633c648da57079c8a3b64127e5ed11643fb5438
Headers show
Series [kirkstone,01/35] dbus: fix CVE-2022-42010 Check brackets in signature nest correctly | expand

Commit Message

Steve Sakoman Nov. 20, 2022, 2:14 p.m. UTC 
Prepare for version bump which includes this fix

This reverts commit 791fe354e5887af3fa3d3f772fafacc5eaedca21.
---
 .../expat/expat/CVE-2022-43680.patch          | 33 -------------------
 meta/recipes-core/expat/expat_2.4.9.bb        |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 meta/recipes-core/expat/expat/CVE-2022-43680.patch
diff mbox series

Patch

diff --git a/meta/recipes-core/expat/expat/CVE-2022-43680.patch b/meta/recipes-core/expat/expat/CVE-2022-43680.patch
deleted file mode 100644
index 76c55edc76..0000000000
--- a/meta/recipes-core/expat/expat/CVE-2022-43680.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-CVE: CVE-2022-43680
-Upstream-Status: Backport [5290462a7ea1278a8d5c0d5b2860d4e244f997e4]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 5290462a7ea1278a8d5c0d5b2860d4e244f997e4 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 20 Sep 2022 02:44:34 +0200
-Subject: [PATCH] lib: Fix overeager DTD destruction in
- XML_ExternalEntityParserCreate
-
----
- expat/lib/xmlparse.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index aacd6e7fc..57bf103cc 100644
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -1068,6 +1068,14 @@ parserCreate(const XML_Char *encodingName,
-   parserInit(parser, encodingName);
- 
-   if (encodingName && ! parser->m_protocolEncodingName) {
-+    if (dtd) {
-+      // We need to stop the upcoming call to XML_ParserFree from happily
-+      // destroying parser->m_dtd because the DTD is shared with the parent
-+      // parser and the only guard that keeps XML_ParserFree from destroying
-+      // parser->m_dtd is parser->m_isParamEntity but it will be set to
-+      // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all).
-+      parser->m_dtd = NULL;
-+    }
-     XML_ParserFree(parser);
-     return NULL;
-   }
diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.4.9.bb
index 22f9845a99..cb007708c7 100644
--- a/meta/recipes-core/expat/expat_2.4.9.bb
+++ b/meta/recipes-core/expat/expat_2.4.9.bb
@@ -9,7 +9,6 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb"
 VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}"
 
 SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2  \
-           file://CVE-2022-43680.patch \
            file://run-ptest \
            "