There was new release of expat today and I have sent an upgrade (including 2 CVEs) instead of this CVE patch. Peter
> -----Original Message----- > From: [email protected] <openembedded- > [email protected]> On Behalf Of Yoann Congal via > lists.openembedded.org > Sent: Saturday, January 31, 2026 8:56 > To: [email protected] > Subject: [OE-core][whinlatter 11/22] expat: patch CVE-2026-24515 > > From: Peter Marko <[email protected]> > > Pick commits from PR linked in NVD report. > > Signed-off-by: Peter Marko <[email protected]> > Signed-off-by: Yoann Congal <[email protected]> > --- > .../expat/expat/CVE-2026-24515-01.patch | 43 +++++++ > .../expat/expat/CVE-2026-24515-02.patch | 117 ++++++++++++++++++ > meta/recipes-core/expat/expat_2.7.3.bb | 2 + > 3 files changed, 162 insertions(+) > create mode 100644 meta/recipes-core/expat/expat/CVE-2026-24515-01.patch > create mode 100644 meta/recipes-core/expat/expat/CVE-2026-24515-02.patch > > diff --git a/meta/recipes-core/expat/expat/CVE-2026-24515-01.patch > b/meta/recipes-core/expat/expat/CVE-2026-24515-01.patch > new file mode 100644 > index 00000000000..c61e49aefdd > --- /dev/null > +++ b/meta/recipes-core/expat/expat/CVE-2026-24515-01.patch > @@ -0,0 +1,43 @@ > +From 86fc914a7acc49246d5fde0ab6ed97eb8a0f15f9 Mon Sep 17 00:00:00 2001 > +From: Sebastian Pipping <[email protected]> > +Date: Sun, 18 Jan 2026 17:53:37 +0100 > +Subject: [PATCH] lib: Make XML_ExternalEntityParserCreate copy unknown > + encoding handler user data > + > +Patch suggested by Artiphishell Inc. > + > +CVE: CVE-2026-24515 > +Upstream-Status: Backport > [https://github.com/libexpat/libexpat/commit/86fc914a7acc49246d5fde0ab6ed97eb > 8a0f15f9] > +Signed-off-by: Peter Marko <[email protected]> > +--- > + expat/lib/xmlparse.c | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/lib/xmlparse.c b/lib/xmlparse.c > +index 593cd90d..18577ee3 100644 > +--- a/lib/xmlparse.c > ++++ b/lib/xmlparse.c > +@@ -1754,6 +1754,7 @@ XML_ExternalEntityParserCreate(XML_Parser > oldParser, const XML_Char *context, > + XML_ExternalEntityRefHandler oldExternalEntityRefHandler; > + XML_SkippedEntityHandler oldSkippedEntityHandler; > + XML_UnknownEncodingHandler oldUnknownEncodingHandler; > ++ void *oldUnknownEncodingHandlerData; > + XML_ElementDeclHandler oldElementDeclHandler; > + XML_AttlistDeclHandler oldAttlistDeclHandler; > + XML_EntityDeclHandler oldEntityDeclHandler; > +@@ -1799,6 +1800,7 @@ XML_ExternalEntityParserCreate(XML_Parser > oldParser, const XML_Char *context, > + oldExternalEntityRefHandler = parser->m_externalEntityRefHandler; > + oldSkippedEntityHandler = parser->m_skippedEntityHandler; > + oldUnknownEncodingHandler = parser->m_unknownEncodingHandler; > ++ oldUnknownEncodingHandlerData = parser- > >m_unknownEncodingHandlerData; > + oldElementDeclHandler = parser->m_elementDeclHandler; > + oldAttlistDeclHandler = parser->m_attlistDeclHandler; > + oldEntityDeclHandler = parser->m_entityDeclHandler; > +@@ -1859,6 +1861,7 @@ XML_ExternalEntityParserCreate(XML_Parser > oldParser, const XML_Char *context, > + parser->m_externalEntityRefHandler = oldExternalEntityRefHandler; > + parser->m_skippedEntityHandler = oldSkippedEntityHandler; > + parser->m_unknownEncodingHandler = oldUnknownEncodingHandler; > ++ parser->m_unknownEncodingHandlerData = > oldUnknownEncodingHandlerData; > + parser->m_elementDeclHandler = oldElementDeclHandler; > + parser->m_attlistDeclHandler = oldAttlistDeclHandler; > + parser->m_entityDeclHandler = oldEntityDeclHandler; > diff --git a/meta/recipes-core/expat/expat/CVE-2026-24515-02.patch > b/meta/recipes-core/expat/expat/CVE-2026-24515-02.patch > new file mode 100644 > index 00000000000..b160f4f343e > --- /dev/null > +++ b/meta/recipes-core/expat/expat/CVE-2026-24515-02.patch > @@ -0,0 +1,117 @@ > +From 8efea3e255d55c7e0a5b70b226f4652ab00e1a27 Mon Sep 17 00:00:00 2001 > +From: Sebastian Pipping <[email protected]> > +Date: Sun, 18 Jan 2026 17:26:31 +0100 > +Subject: [PATCH] tests: Cover effect of XML_SetUnknownEncodingHandler user > + data > + > +CVE: CVE-2026-24515 > +Upstream-Status: Backport > [https://github.com/libexpat/libexpat/commit/8efea3e255d55c7e0a5b70b226f4652a > b00e1a27] > +Signed-off-by: Peter Marko <[email protected]> > +--- > + tests/basic_tests.c | 42 +++++++++++++++++++++++++++++++++++++++ > + tests/handlers.c | 10 ++++++++++ > + tests/handlers.h | 3 +++ > + 3 files changed, 55 insertions(+) > + > +diff --git a/tests/basic_tests.c b/tests/basic_tests.c > +index 0231e094..0ed98d86 100644 > +--- a/tests/basic_tests.c > ++++ b/tests/basic_tests.c > +@@ -4570,6 +4570,46 @@ > START_TEST(test_unknown_encoding_invalid_attr_value) { > + } > + END_TEST > + > ++START_TEST(test_unknown_encoding_user_data_primary) { > ++ // This test is based on ideas contributed by Artiphishell Inc. > ++ const char *const text = "<?xml version='1.0' encoding='x-unk'?>\n" > ++ "<root />\n"; > ++ XML_Parser parser = XML_ParserCreate(NULL); > ++ XML_SetUnknownEncodingHandler(parser, > ++ user_data_checking_unknown_encoding_handler, > ++ (void *)(intptr_t)0xC0FFEE); > ++ > ++ assert_true(_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), > XML_TRUE) > ++ == XML_STATUS_OK); > ++ > ++ XML_ParserFree(parser); > ++} > ++END_TEST > ++ > ++START_TEST(test_unknown_encoding_user_data_secondary) { > ++ // This test is based on ideas contributed by Artiphishell Inc. > ++ const char *const text_main = "<!DOCTYPE r [\n" > ++ " <!ENTITY ext SYSTEM 'ext.ent'>\n" > ++ "]>\n" > ++ "<r>&ext;</r>\n"; > ++ const char *const text_external = "<?xml version='1.0' > encoding='x-unk'?>\n" > ++ "<e>data</e>"; > ++ ExtTest2 test_data = {text_external, (int)strlen(text_external), NULL, > NULL}; > ++ XML_Parser parser = XML_ParserCreate(NULL); > ++ XML_SetExternalEntityRefHandler(parser, external_entity_loader2); > ++ XML_SetUnknownEncodingHandler(parser, > ++ user_data_checking_unknown_encoding_handler, > ++ (void *)(intptr_t)0xC0FFEE); > ++ XML_SetUserData(parser, &test_data); > ++ > ++ assert_true(_XML_Parse_SINGLE_BYTES(parser, text_main, > (int)strlen(text_main), > ++ XML_TRUE) > ++ == XML_STATUS_OK); > ++ > ++ XML_ParserFree(parser); > ++} > ++END_TEST > ++ > + /* Test an external entity parser set to use latin-1 detects UTF-16 > + * BOMs correctly. > + */ > +@@ -6416,6 +6456,8 @@ make_basic_test_case(Suite *s) { > + tcase_add_test(tc_basic, test_unknown_encoding_invalid_surrogate); > + tcase_add_test(tc_basic, test_unknown_encoding_invalid_high); > + tcase_add_test(tc_basic, test_unknown_encoding_invalid_attr_value); > ++ tcase_add_test(tc_basic, test_unknown_encoding_user_data_primary); > ++ tcase_add_test(tc_basic, test_unknown_encoding_user_data_secondary); > + tcase_add_test__if_xml_ge(tc_basic, test_ext_entity_latin1_utf16le_bom); > + tcase_add_test__if_xml_ge(tc_basic, test_ext_entity_latin1_utf16be_bom); > + tcase_add_test__if_xml_ge(tc_basic, test_ext_entity_latin1_utf16le_bom2); > +diff --git a/tests/handlers.c b/tests/handlers.c > +index 5bca2b1f..d077f688 100644 > +--- a/tests/handlers.c > ++++ b/tests/handlers.c > +@@ -45,6 +45,7 @@ > + # undef NDEBUG /* because test suite relies on assert(...) at the moment */ > + #endif > + > ++#include <stdint.h> > + #include <stdio.h> > + #include <string.h> > + #include <assert.h> > +@@ -407,6 +408,15 @@ long_encoding_handler(void *userData, const > XML_Char *encoding, > + return XML_STATUS_OK; > + } > + > ++int XMLCALL > ++user_data_checking_unknown_encoding_handler(void *userData, > ++ const XML_Char *encoding, > ++ XML_Encoding *info) { > ++ const intptr_t number = (intptr_t)userData; > ++ assert_true(number == 0xC0FFEE); > ++ return long_encoding_handler(userData, encoding, info); > ++} > ++ > + /* External Entity Handlers */ > + > + int XMLCALL > +diff --git a/tests/handlers.h b/tests/handlers.h > +index fa6267fb..915040e5 100644 > +--- a/tests/handlers.h > ++++ b/tests/handlers.h > +@@ -159,6 +159,9 @@ extern int XMLCALL long_encoding_handler(void > *userData, > + const XML_Char *encoding, > + XML_Encoding *info); > + > ++extern int XMLCALL user_data_checking_unknown_encoding_handler( > ++ void *userData, const XML_Char *encoding, XML_Encoding *info); > ++ > + /* External Entity Handlers */ > + > + typedef struct ExtOption { > diff --git a/meta/recipes-core/expat/expat_2.7.3.bb b/meta/recipes- > core/expat/expat_2.7.3.bb > index 069254e13c3..12ca9b004d2 100644 > --- a/meta/recipes-core/expat/expat_2.7.3.bb > +++ b/meta/recipes-core/expat/expat_2.7.3.bb > @@ -10,6 +10,8 @@ VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" > > SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat- > ${PV}.tar.bz2 \ > file://run-ptest \ > + file://CVE-2026-24515-01.patch \ > + file://CVE-2026-24515-02.patch \ > " > > GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/";
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230243): https://lists.openembedded.org/g/openembedded-core/message/230243 Mute This Topic: https://lists.openembedded.org/mt/117558521/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
