From: Archana Polampalli <archana.polampa...@windriver.com> An issue was discovered in libexpat before 2.6.3. xmlparse.c does not reject a negative length for XML_ParseBuffer.
Signed-off-by: Archana Polampalli <archana.polampa...@windriver.com> --- .../expat/expat/CVE-2024-45490-0001.patch | 35 +++++++++++++ .../expat/expat/CVE-2024-45490-0002.patch | 49 +++++++++++++++++++ meta/recipes-core/expat/expat_2.5.0.bb | 2 + 3 files changed, 86 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2024-45490-0001.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2024-45490-0002.patch diff --git a/meta/recipes-core/expat/expat/CVE-2024-45490-0001.patch b/meta/recipes-core/expat/expat/CVE-2024-45490-0001.patch new file mode 100644 index 0000000000..acdeb5b7df --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2024-45490-0001.patch @@ -0,0 +1,35 @@ +From 1d4f03d21b4f42031716522a6b96346b7a60d4c4 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +Date: Mon, 19 Aug 2024 22:26:07 +0200 +Subject: [PATCH] lib: Reject negative len for XML_ParseBuffer + +Reported by TaiYou + +CVE: CVE-2024-45490 + +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/5c1a31642e243f4870c0bd1f2afc7597976521bf] + +Signed-off-by: Archana Polampalli <archana.polampa...@windriver.com> +--- + lib/xmlparse.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lib/xmlparse.c b/lib/xmlparse.c +index 9984d02..6f0440b 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -1996,6 +1996,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) { + + if (parser == NULL) + return XML_STATUS_ERROR; ++ ++ if (len < 0) { ++ parser->m_errorCode = XML_ERROR_INVALID_ARGUMENT; ++ return XML_STATUS_ERROR; ++ } ++ + switch (parser->m_parsingStatus.parsing) { + case XML_SUSPENDED: + parser->m_errorCode = XML_ERROR_SUSPENDED; +-- +2.40.0 diff --git a/meta/recipes-core/expat/expat/CVE-2024-45490-0002.patch b/meta/recipes-core/expat/expat/CVE-2024-45490-0002.patch new file mode 100644 index 0000000000..e769182087 --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2024-45490-0002.patch @@ -0,0 +1,49 @@ +From 2db233019f551fe4c701bbbc5eb0fa58ff349daa Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +Date: Sun, 25 Aug 2024 19:09:51 +0200 +Subject: [PATCH] doc: Document that XML_Parse/XML_ParseBuffer reject "len < 0" + +CVE: CVE-2024-45490 + +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/2db233019f551fe4c701bbbc5eb0fa58ff349daa] + +Signed-off-by: Archana Polampalli <archana.polampa...@windriver.com> +--- + doc/reference.html | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/doc/reference.html b/doc/reference.html +index cdf3983..ebae824 100644 +--- a/doc/reference.html ++++ b/doc/reference.html +@@ -1097,7 +1097,9 @@ containing part (or perhaps all) of the document. The number of bytes of s + that are part of the document is indicated by <code>len</code>. This means + that <code>s</code> doesn't have to be null terminated. It also means that + if <code>len</code> is larger than the number of bytes in the block of +-memory that <code>s</code> points at, then a memory fault is likely. The ++memory that <code>s</code> points at, then a memory fault is likely. ++Negative values for <code>len</code> are rejected since Expat 2.2.1. ++The + <code>isFinal</code> parameter informs the parser that this is the last + piece of the document. Frequently, the last piece is empty (i.e. + <code>len</code> is zero.) +@@ -1113,11 +1115,17 @@ XML_ParseBuffer(XML_Parser p, + int isFinal); + </pre> + <div class="fcndef"> ++<p> + This is just like <code><a href= "#XML_Parse" >XML_Parse</a></code>, + except in this case Expat provides the buffer. By obtaining the + buffer from Expat with the <code><a href= "#XML_GetBuffer" + >XML_GetBuffer</a></code> function, the application can avoid double + copying of the input. ++</p> ++ ++<p> ++Negative values for <code>len</code> are rejected since Expat 2.6.3. ++</p> + </div> + + <h4 id="XML_GetBuffer">XML_GetBuffer</h4> +-- +2.40.0 diff --git a/meta/recipes-core/expat/expat_2.5.0.bb b/meta/recipes-core/expat/expat_2.5.0.bb index 31e989cfe2..6d927ec8c8 100644 --- a/meta/recipes-core/expat/expat_2.5.0.bb +++ b/meta/recipes-core/expat/expat_2.5.0.bb @@ -22,6 +22,8 @@ SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA file://CVE-2023-52426-009.patch \ file://CVE-2023-52426-010.patch \ file://CVE-2023-52426-011.patch \ + file://CVE-2024-45490-0001.patch \ + file://CVE-2024-45490-0002.patch \ " UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/"; -- 2.40.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#204264): https://lists.openembedded.org/g/openembedded-core/message/204264 Mute This Topic: https://lists.openembedded.org/mt/108304022/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
