Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Thursday, April 3
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1310
The following changes since commit 2f242f2a269bb18aab703f685e27f9c3ba761db8:
cve-update-nvd2-native: handle missing vulnStatus (2025-03-31 08:26:56 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Martin Jansa (1):
mc: set ac_cv_path_ZIP to avoid buildpaths QA issues
Michael Halstead (1):
yocto-uninative: Update to 4.7 for glibc 2.41
Peter Marko (2):
expat: patch CVE-2024-8176
freetype: follow-up patch for CVE-2025-27363
Virendra Thakur (1):
rust-cross-canadian: Set CVE_STATUS ignore for CVE-2024-43402
meta/conf/distro/include/yocto-uninative.inc | 10 +- ...ests-Cover-indirect-entity-recursion.patch | 103 ++ .../expat/expat/CVE-2024-8176-01.patch | 1477 +++++++++++++++++ .../expat/expat/CVE-2024-8176-02.patch | 248 +++ meta/recipes-core/expat/expat_2.6.4.bb | 3 + .../rust/rust-cross-canadian.inc | 4 + meta/recipes-extended/mc/mc_4.8.31.bb | 1 + .../freetype/freetype/CVE-2025-27363.patch | 33 + .../freetype/freetype_2.13.2.bb | 4 +- 9 files changed, 1877 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-core/expat/expat/0001-tests-Cover-indirect-entity-recursion.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2024-8176-01.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2024-8176-02.patch create mode 100644 meta/recipes-graphics/freetype/freetype/CVE-2025-27363.patch
Signature · 1 line
2.43.0
PATCH 1/5 expat: patch CVE-2024-8176
From: Peter Marko <[email protected]>
Backport https://github.com/libexpat/libexpat/pull/973
Patch created by:
git diff 2fc36833334340ff7ddca374d86daa8744c1dfa3..99529768b4a722f46c69b04b874c1d45b3eb819c
Additional backport (containing changes in tests only) was needed to apply it cleanly.
Additional backport https://github.com/libexpat/libexpat/pull/989
which has fixed regression of the first fix.
Patch created by:
git diff 91ca72e913af94ed44ef2a80a9dd542be3e5766c..308c31ed647f2c6aebe33ca3a4fa9e1436f461e2
--- ...ests-Cover-indirect-entity-recursion.patch | 103 ++ .../expat/expat/CVE-2024-8176-01.patch | 1477 +++++++++++++++++ .../expat/expat/CVE-2024-8176-02.patch | 248 +++ meta/recipes-core/expat/expat_2.6.4.bb | 3 + 4 files changed, 1831 insertions(+) create mode 100644 meta/recipes-core/expat/expat/0001-tests-Cover-indirect-entity-recursion.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2024-8176-01.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2024-8176-02.patch
meta/recipes-core/expat/expat/0001-tests-Cover-indirect-entity-recursion.patch new file +103 -0
@@ -0,0 +1,103 @@ +From 3d5fdbb44e80ed789e4f6510542d77d6284fbd0e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Sat, 23 Nov 2024 14:20:21 +0100 +Subject: [PATCH] tests: Cover indirect entity recursion + +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/3d5fdbb44e80ed789e4f6510542d77d6284fbd0e] +Signed-off-by: Peter Marko <[email protected]> +--- + expat/tests/basic_tests.c | 74 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 74 insertions(+) + +diff --git a/expat/tests/basic_tests.c b/expat/tests/basic_tests.c +index d38b8fd1..d2306772 100644 +--- a/expat/tests/basic_tests.c ++++ b/expat/tests/basic_tests.c +@@ -1202,6 +1202,79 @@ START_TEST(test_wfc_no_recursive_entity_refs) { + } + END_TEST + ++START_TEST(test_no_indirectly_recursive_entity_refs) { ++ struct TestCase { ++ const char *doc; ++ bool usesParameterEntities; ++ }; ++ ++ const struct TestCase cases[] = { ++ // general entity + character data ++ {"<!DOCTYPE a [\n" ++ " <!ENTITY e1 '&e2;'>\n" ++ " <!ENTITY e2 '&e1;'>\n" ++ "]><a>&e2;</a>\n", ++ false}, ++ ++ // general entity + attribute value ++ {"<!DOCTYPE a [\n" ++ " <!ENTITY e1 '&e2;'>\n" ++ " <!ENTITY e2 '&e1;'>\n" ++ "]><a k1='&e2;' />\n", ++ false}, ++ ++ // parameter entity ++ {"<!DOCTYPE doc [\n" ++ " <!ENTITY % p1 '%p2;'>\n" ++ " <!ENTITY % p2 '%p1;'>\n" ++ " <!ENTITY % define_g \"<!ENTITY g '%p2;'>\">\n" ++ " %define_g;\n" ++ "]>\n" ++ "<doc/>\n", ++ true}, ++ }; ++ for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) { ++ const char *const doc = cases[i].doc; ++ const bool usesParameterEntities = cases[i].usesParameterEntities; ++ ++ set_subtest("[%i] %s", (int)i, doc); ++ ++#ifdef XML_DTD // both GE and DTD ++ const bool rejection_expected = true; ++#elif XML_GE == 1 // GE but not DTD ++ const bool rejection_expected = ! usesParameterEntities; ++#else // neither DTD nor GE ++ const bool rejection_expected = false; ++#endif ++ ++ XML_Parser parser = XML_ParserCreate(NULL); ++ ++#ifdef XML_DTD ++ if (usesParameterEntities) { ++ assert_true( ++ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS) ++ == 1); ++ } ++#else ++ UNUSED_P(usesParameterEntities); ++#endif // XML_DTD ++ ++ const enum XML_Status status ++ = _XML_Parse_SINGLE_BYTES(parser, doc, (int)strlen(doc), ++ /*isFinal*/ XML_TRUE); ++ ++ if (rejection_expected) { ++ assert_true(status == XML_STATUS_ERROR); ++ assert_true(XML_GetErrorCode(parser) == XML_ERROR_RECURSIVE_ENTITY_REF); ++ } else { ++ assert_true(status == XML_STATUS_OK); ++ } ++ ++ XML_ParserFree(parser); ++ } ++} ++END_TEST ++ + START_TEST(test_recursive_external_parameter_entity_2) { + struct TestCase { + const char *doc; +@@ -5969,6 +6042,7 @@ make_basic_test_case(Suite *s) { + tcase_add_test(tc_basic, test_not_standalone_handler_reject); + tcase_add_test(tc_basic, test_not_standalone_handler_accept); + tcase_add_test__if_xml_ge(tc_basic, test_wfc_no_recursive_entity_refs); ++ tcase_add_test(tc_basic, test_no_indirectly_recursive_entity_refs); + tcase_add_test__ifdef_xml_dtd(tc_basic, test_ext_entity_invalid_parse); + tcase_add_test__if_xml_ge(tc_basic, test_dtd_default_handling); + tcase_add_test(tc_basic, test_dtd_attr_handling);
meta/recipes-core/expat/expat/CVE-2024-8176-01.patch new file +1477 -0
1,477 lines not on this page · raw message
meta/recipes-core/expat/expat/CVE-2024-8176-02.patch new file +248 -0
248 lines not on this page · raw message
meta/recipes-core/expat/expat_2.6.4.bb +3 -0
@@ -10,6 +10,9 @@ VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ file://run-ptest \ + file://0001-tests-Cover-indirect-entity-recursion.patch;striplevel=2 \ + file://CVE-2024-8176-01.patch;striplevel=2 \ + file://CVE-2024-8176-02.patch;striplevel=2 \ " GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/"
Signature · 1 line
2.43.0
PATCH 2/5 freetype: follow-up patch for CVE-2025-27363
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
Per [1] there are two patches needed - [2] which is already included in 3.13.1 and [3] which is only in 2.13.3.
Backport the second patch.
[1] https://gitlab.freedesktop.org/freetype/freetype/-/issues/1322
[2] https://gitlab.freedesktop.org/freetype/freetype/-/commit/ef636696524b081f1b8819eb0c6a0b932d35757d
[3] https://gitlab.freedesktop.org/freetype/freetype/-/commit/73720c7c9958e87b3d134a7574d1720ad2d24442
--- .../freetype/freetype/CVE-2025-27363.patch | 33 +++++++++++++++++++ .../freetype/freetype_2.13.2.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/freetype/freetype/CVE-2025-27363.patch
meta/recipes-graphics/freetype/freetype/CVE-2025-27363.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 73720c7c9958e87b3d134a7574d1720ad2d24442 Mon Sep 17 00:00:00 2001 +From: Alexei Podtelezhnikov <[email protected]> +Date: Sun, 23 Jun 2024 10:58:00 -0400 +Subject: [PATCH] * src/truetype/ttgload.c (load_truetype_glyph): Unsigned fix. + +CVE: CVE-2025-27363 +Upstream-Status: Backport [https://gitlab.freedesktop.org/freetype/freetype/-/commit/73720c7c9958e87b3d134a7574d1720ad2d24442] +Signed-off-by: Peter Marko <[email protected]> +--- + src/truetype/ttgload.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c +index 8cddc394c..b656ccf04 100644 +--- a/src/truetype/ttgload.c ++++ b/src/truetype/ttgload.c +@@ -1741,14 +1741,14 @@ + if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) || + FT_IS_VARIATION( FT_FACE( face ) ) ) + { +- short i, limit; ++ FT_UShort i, limit; + FT_SubGlyph subglyph; + + FT_Outline outline = { 0, 0, NULL, NULL, NULL, 0 }; + FT_Vector* unrounded = NULL; + + +- limit = (short)gloader->current.num_subglyphs; ++ limit = (FT_UShort)gloader->current.num_subglyphs; + + /* construct an outline structure for */ + /* communication with `TT_Vary_Apply_Glyph_Deltas' */
meta/recipes-graphics/freetype/freetype_2.13.2.bb +3 -1
@@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=843b6efc16f6b1652ec97f89d5a516c0 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ " -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz" +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \ + file://CVE-2025-27363.patch \ +" SRC_URI[sha256sum] = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d" UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.43.0
PATCH 3/5 rust-cross-canadian: Set CVE_STATUS ignore for CVE-2024-43402
In reply to Steve SakomanFrom: Virendra Thakur <[email protected]>
This CVE was created because fix for CVE-2024-24576 was incomplete. Ignore the new CVE in the same way as the old one.
See https://nvd.nist.gov/vuln/detail/CVE-2024-43402
As per NVD, this CVE only affects to Windows platform
--- meta/recipes-devtools/rust/rust-cross-canadian.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-devtools/rust/rust-cross-canadian.inc +4 -0
@@ -15,6 +15,10 @@ SRC_URI += "file://target-rust-ccld.c" LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7" S = "${WORKDIR}" +# As per NVD, this CVE only affects to Windows platform +# Link: https://nvd.nist.gov/vuln/detail/CVE-2024-43402 +CVE_STATUS[CVE-2024-43402] = "not-applicable-platform: Issue only applies on Windows" + # Need to use our SDK's sh here, see #14878 create_sdk_wrapper () { file="$1"
Signature · 1 line
2.43.0
PATCH 4/5 yocto-uninative: Update to 4.7 for glibc 2.41
In reply to Steve SakomanFrom: Michael Halstead <[email protected]>
--- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/conf/distro/include/yocto-uninative.inc +5 -5
@@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.40" -UNINATIVE_VERSION = "4.6" +UNINATIVE_MAXGLIBCVERSION = "2.41" +UNINATIVE_VERSION = "4.7" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "c2d36338272eba101580f648dd8dff5352cdb4c1809db7dedf8fc4d7e7df716c" -UNINATIVE_CHECKSUM[i686] ?= "0041584678109c18deca48fb59eaf14cf725cf024a170ab537b354b63240c504" -UNINATIVE_CHECKSUM[x86_64] ?= "6bf00154c5a7bc48adbf63fd17684bb87eb07f4814fbb482a3fbd817c1ccf4c5" +UNINATIVE_CHECKSUM[aarch64] ?= "ac440e4fc80665c79f9718c665c6e28d771e51609c088c3c97ba3ad5cfed197a" +UNINATIVE_CHECKSUM[i686] ?= "c5efa31450f3bbd63ea961d4e7c747ae41317937d429f65e1d5cf2050338e27a" +UNINATIVE_CHECKSUM[x86_64] ?= "5800d4e9a129d1be09cf548918d25f74e91a7c1193ae5239d5b0c9246c486d2c"
Signature · 1 line
2.43.0
PATCH 5/5 mc: set ac_cv_path_ZIP to avoid buildpaths QA issues
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
* in builds with zip in HOSTTOOLS mc fails with:
ERROR: mc-4.8.31-r0 do_package_qa: QA Issue: File /usr/libexec/mc/extfs.d/uzip in package mc-helpers-perl contains reference to TMPDIR [buildpaths] and it's because of the path to zip:
mc/4.8.31/package $ grep -R styhead .
./usr/libexec/mc/extfs.d/uzip:my $app_zip = "TMPDIR/hosttools/zip";
* don't use /usr/bin/env as in other cases, because app_zip is then used e.g. with:
my $cmd_addlink = "$app_zip -g -y";
--- meta/recipes-extended/mc/mc_4.8.31.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-extended/mc/mc_4.8.31.bb +1 -0
@@ -31,6 +31,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PERL_FOR_BUILD='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "ac_cv_path_ZIP='/usr/bin/zip'" CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install:append () {
Signature · 1 line
2.43.0