expat: Backport fix for CVE-2024-28757
PATCH 1/1 expat: Backport fix for CVE-2024-28757
Upstream ref:
https://github.com/libexpat/libexpat/pull/842
https://github.com/libexpat/libexpat/issues/839
Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454]
--- .../expat/expat/CVE-2024-28757.patch | 57 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2024-28757.patch
meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +57 -0
@@ -0,0 +1,57 @@ +From 1d50b80cf31de87750103656f6eb693746854aa8 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Mon, 4 Mar 2024 23:49:06 +0100 +Subject: [PATCH] lib/xmlparse.c: Detect billion laughs attack with isolated + external parser + +When parsing DTD content with code like .. + + XML_Parser parser = XML_ParserCreate(NULL); + XML_Parser ext_parser = XML_ExternalEntityParserCreate(parser, NULL, NULL); + enum XML_Status status = XML_Parse(ext_parser, doc, (int)strlen(doc), XML_TRUE); + +.. there are 0 bytes accounted as direct input and all input from `doc` accounted +as indirect input. Now function accountingGetCurrentAmplification cannot calculate +the current amplification ratio as "(direct + indirect) / direct", and it did refuse +to divide by 0 as one would expect, but it returned 1.0 for this case to indicate +no amplification over direct input. As a result, billion laughs attacks from +DTD-only input were not detected with this isolated way of using an external parser. + +The new approach is to assume direct input of length not 0 but 22 -- derived from +ghost input "<!ENTITY a SYSTEM 'b'>", the shortest possible way to include an external +DTD --, and do the usual "(direct + indirect) / direct" math with "direct := 22". + +GitHub issue #839 has more details on this issue and its origin in ClusterFuzz +finding 66812. +--- +CVE: CVE-2024-28757 +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454] +Signed-off-by: Ashish Sharma <[email protected]> +--- + expat/lib/xmlparse.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index b884d82b5..d44baa68d 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -7787,6 +7787,8 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) { + + static float + accountingGetCurrentAmplification(XML_Parser rootParser) { ++ // 1.........1.........12 => 22 ++ const size_t lenOfShortestInclude = sizeof("<!ENTITY a SYSTEM 'b'>") - 1; + const XmlBigCount countBytesOutput + = rootParser->m_accounting.countBytesDirect + + rootParser->m_accounting.countBytesIndirect; +@@ -7794,7 +7796,9 @@ accountingGetCurrentAmplification(XML_Parser rootParser) { + = rootParser->m_accounting.countBytesDirect + ? (countBytesOutput + / (float)(rootParser->m_accounting.countBytesDirect)) +- : 1.0f; ++ : ((lenOfShortestInclude ++ + rootParser->m_accounting.countBytesIndirect) ++ / (float)lenOfShortestInclude); + assert(! rootParser->m_parentParser); + return amplificationFactor; + }
meta/recipes-core/expat/expat_2.2.9.bb +1 -0
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/libexpat/libexpat.git;protocol=https;branch=master \ file://libtool-tag.patch \ file://CVE-2022-40674.patch \ file://CVE-2022-43680.patch \ + file://CVE-2024-28757.patch \ " SRCREV = "a7bc26b69768f7fb24f0c7976fae24b157b85b13"
Signature · 1 line
2.24.4
Quoted 7 lines · Ashish Sharma via lists.openembedded.org
Upstream ref:
https://github.com/libexpat/libexpat/pull/842
https://github.com/libexpat/libexpat/issues/839Upstream-Status: Backport
[https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454]
This link here and in the patch points to incorrect change. Should it be:
https://github.com/libexpat/libexpat/pull/842/commits/1d50b80cf31de87750103656f6eb693746854aa8
?
Quoted 121 lines
Signed-off-by Ashish Sharma <[email protected]>---
.../expat/expat/CVE-2024-28757.patch | 57
+++++++++++++++++++
meta/recipes-core/expat/expat_2.2.9.bb | 1 +2 files changed, 58 insertions(+)create mode 100644 meta/recipes-core/expat/expat/CVE-2024- 28757.patch
meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +1
-0@@ -0,0 +1,57 @@ +From 1d50b80cf31de87750103656f6eb693746854aa8 Mon Sep 17 00:00:002001
meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +3
-0+From: Sebastian Pipping <[email protected]> +Date: Mon, 4 Mar 2024 23:49:06 +0100 +Subject: [PATCH] lib/xmlparse.c: Detect billion laughs attack withisolated
+ external parsermeta/recipes-core/expat/expat/CVE-2024-28757.patch new file +5
-0+ +When parsing DTD content with code like .. + + XML_Parser parser = XML_ParserCreate(NULL); + XML_Parser ext_parser = XML_ExternalEntityParserCreate(parser,NULL, NULL);
+ enumXML_Statusstatus =XML_Parse(ext_parser, doc, (int)strlen(doc), XML_TRUE);
+
+.. there are 0 bytes accounted as direct input and all input fromdocaccounted
+as indirect input. Now function accountingGetCurrentAmplification cannot calculate
+the current amplification ratio as "(direct + indirect) / direct", and it did refuse
+to divide by 0 as one would expect, but it returned 1.0 for this case to indicate
+no amplification over direct input. As a result, billion laughs attacks from
+DTD-only input were not detected with this isolated way of using an external parser.meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +2
-0+ +The new approach is to assume direct input of length not 0 but 22 --derived from
+ghost input "<!ENTITY a SYSTEM 'b'>", the shortest possible way to include an external
+DTD --, and do the usual "(direct + indirect) / direct" math with "direct := 22".meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +2
-0+ +GitHub issue #839 has more details on this issue and its origin inClusterFuzz
meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +4
-0+finding 66812. +--- +CVE: CVE-2024-28757 +Upstream-Status: Backport[https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8
f62d1d7b52695454]meta/recipes-core/expat/expat/CVE-2024-28757.patch new file +10
-0+Signed-off-by: Ashish Sharma <[email protected]> +--- + expat/lib/xmlparse.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index b884d82b5..d44baa68d 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -7787,6 +7787,8 @@ copyString(const XML_Char *s, const
XML_Memory_Handling_Suite*memsuite) {
+
+ static float
+accountingGetCurrentAmplification(XML_Parser rootParser){ ++ //
1.........1.........12 => 22
++ constsize_tlenOfShortestInclude =sizeof("<!ENTITY a SYSTEM 'b'>")- 1;
+ const XmlBigCount countBytesOutput
+ =rootParser->m_accounting.countBytesDirect
+ +rootParser->m_accounting.countBytesIndirect; +@@ -7794,7 +7796,9 @@accountingGetCurrentAmplification(XML_Parser rootParser){
+ =rootParser->m_accounting.countBytesDirect
+ ? (countBytesOutput
+ / (float)(rootParser-Quoted 1 line
m_accounting.countBytesDirect))
+- : 1.0f;
++ : ((lenOfShortestInclude
++ +rootParser->m_accounting.countBytesIndirect) ++ / (float)lenOfShortestInclude);
+assert(! rootParser->m_parentParser);
+ return amplificationFactor;
+ }meta/recipes- renamed from meta/recipes-core/expat/expat_2.2.9.bb +0
-0core/expat/expat_2.2.9.bb
index8a5006e59a..ea50533ed9100644meta/recipes-core/expat/expat_2.2.9.bb +0
-0@@ -22,6 +22,7 @@ SRC_URI ="
git://github.com/libexpat/libexpat.git;protocol=https;branch=master\
file://libtool-tag.patch \
file://CVE-2022-40674.patch \
file://CVE-2022-43680.patch \
+ file://CVE-2024-28757.patch \
"
SRCREV = "a7bc26b69768f7fb24f0c7976fae24b157b85b13"-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#197079):
https://lists.openembedded.org/g/openembedded-core/message/197079
Mute This Topic: https://lists.openembedded.org/mt/104913576/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Fails at build time:
ERROR: expat-2.2.9-r0 do_patch: Applying patch 'CVE-2024-28757.patch'
on target directory '/home/steve/builds/poky-contrib-dunfell/build/tmp/work/core2-64-poky-linux/expat/2.2.9-r0/git/expat' Command Error: 'quilt --quiltrc /home/steve/builds/poky-contrib-dunfell/build/tmp/work/core2-64-poky-linux/expat/2.2.9-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch CVE-2024-28757.patch
can't find file to patch at input line 38
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 1d50b80cf31de87750103656f6eb693746854aa8 Mon Sep 17 00:00:00 2001 |From: Sebastian Pipping <[email protected]> |Date: Mon, 4 Mar 2024 23:49:06 +0100 |Subject: [PATCH] lib/xmlparse.c: Detect billion laughs attack with isolated | external parser | |When parsing DTD content with code like .. | | XML_Parser parser = XML_ParserCreate(NULL); | XML_Parser ext_parser = XML_ExternalEntityParserCreate(parser, NULL, NULL); | enum XML_Status status = XML_Parse(ext_parser, doc,
(int)strlen(doc), XML_TRUE);
|
|.. there are 0 bytes accounted as direct input and all input from doc accounted
|as indirect input. Now function accountingGetCurrentAmplification cannot calculate
|the current amplification ratio as "(direct + indirect) / direct", and it did refuse
|to divide by 0 as one would expect, but it returned 1.0 for this case to indicate
|no amplification over direct input. As a result, billion laughs attacks from |DTD-only input were not detected with this isolated way of using an external parser.
|
|The new approach is to assume direct input of length not 0 but 22 -- derived from
|ghost input "<!ENTITY a SYSTEM 'b'>", the shortest possible way to include an external
|DTD --, and do the usual "(direct + indirect) / direct" math with "direct := 22".
| |GitHub issue #839 has more details on this issue and its origin in ClusterFuzz |finding 66812. |--- |CVE: CVE-2024-28757 |Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454] |Signed-off-by: Ashish Sharma <[email protected]> |--- | expat/lib/xmlparse.c | 6 +++++- | 1 file changed, 5 insertions(+), 1 deletion(-) | |diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c |index b884d82b5..d44baa68d 100644 |--- a/expat/lib/xmlparse.c |+++ b/expat/lib/xmlparse.c
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
Patch CVE-2024-28757.patch does not apply (enforce with -f)
Quoted 100 lines · Ashish Sharma via lists.openembedded.org
Upstream ref:
https://github.com/libexpat/libexpat/pull/842
https://github.com/libexpat/libexpat/issues/839Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454]
Signed-off-by Ashish Sharma <[email protected]>--- .../expat/expat/CVE-2024-28757.patch | 57 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2024-28757.patchmeta/recipes-core/expat/expat/CVE-2024-28757.patch new file +57
-0@@ -0,0 +1,57 @@ +From 1d50b80cf31de87750103656f6eb693746854aa8 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Mon, 4 Mar 2024 23:49:06 +0100 +Subject: [PATCH] lib/xmlparse.c: Detect billion laughs attack with isolated + external parser + +When parsing DTD content with code like .. + + XML_Parser parser = XML_ParserCreate(NULL); + XML_Parser ext_parser = XML_ExternalEntityParserCreate(parser, NULL, NULL); + enum XML_Status status = XML_Parse(ext_parser, doc, (int)strlen(doc), XML_TRUE); + +.. there are 0 bytes accounted as direct input and all input from `doc` accounted +as indirect input. Now function accountingGetCurrentAmplification cannot calculate +the current amplification ratio as "(direct + indirect) / direct", and it did refuse +to divide by 0 as one would expect, but it returned 1.0 for this case to indicate +no amplification over direct input. As a result, billion laughs attacks from +DTD-only input were not detected with this isolated way of using an external parser. + +The new approach is to assume direct input of length not 0 but 22 -- derived from +ghost input "<!ENTITY a SYSTEM 'b'>", the shortest possible way to include an external +DTD --, and do the usual "(direct + indirect) / direct" math with "direct := 22". + +GitHub issue #839 has more details on this issue and its origin in ClusterFuzz +finding 66812. +--- +CVE: CVE-2024-28757 +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/072eca0b72373da103ce15f8f62d1d7b52695454] +Signed-off-by: Ashish Sharma <[email protected]> +--- + expat/lib/xmlparse.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index b884d82b5..d44baa68d 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -7787,6 +7787,8 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) { + + static float + accountingGetCurrentAmplification(XML_Parser rootParser) { ++ // 1.........1.........12 => 22 ++ const size_t lenOfShortestInclude = sizeof("<!ENTITY a SYSTEM 'b'>") - 1; + const XmlBigCount countBytesOutput + = rootParser->m_accounting.countBytesDirect + + rootParser->m_accounting.countBytesIndirect; +@@ -7794,7 +7796,9 @@ accountingGetCurrentAmplification(XML_Parser rootParser) { + = rootParser->m_accounting.countBytesDirect + ? (countBytesOutput + / (float)(rootParser->m_accounting.countBytesDirect)) +- : 1.0f; ++ : ((lenOfShortestInclude ++ + rootParser->m_accounting.countBytesIndirect) ++ / (float)lenOfShortestInclude); + assert(! rootParser->m_parentParser); + return amplificationFactor; + }meta/recipes-core/expat/expat_2.2.9.bb +1
-1@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/libexpat/libexpat.git;protocol=https;branch=master \ file://libtool-tag.patch \ file://CVE-2022-40674.patch \ file://CVE-2022-43680.patch \ + file://CVE-2024-28757.patch \ " SRCREV = "a7bc26b69768f7fb24f0c7976fae24b157b85b13" --2.24.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#197079): https://lists.openembedded.org/g/openembedded-core/message/197079
Mute This Topic: https://lists.openembedded.org/mt/104913576/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-