Patch review
cover Patch review
Note: this series contains a major OpenSSL upgrade (agreed by YP TSC).
Please review this set of changes for scarthgap and have comments back by end of day Tuesday, March 10.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3349
(Ignore the warning about Centos Stream9, its support is a work in progress for scarthgap)
I also did a full meta-oe build (to check for build failure with the OpenSSL upgrade)
https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/1342
(the warnings are unrelated to this series)
The following changes since commit a9a785d7fa0cfe2a9087dbcde0ef9f0d2a441375:
build-appliance-image: Update to scarthgap head revision (2026-02-27 17:45:15 +0000)
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
for you to fetch changes up to fd8a140eb0742bbc12a23e36c9d24378bc0f462d:
busybox: Fixes CVE-2025-60876 (2026-03-06 23:58:42 +0100)
----------------------------------------------------------------
Hugo SIMELIERE (2):
zlib: Fix CVE-2026-27171
harfbuzz: Fix CVE-2026-22693
Livin Sunny (1):
busybox: Fixes CVE-2025-60876
Paul Barker (1):
create-pull-request: Keep commit hash to be pulled in cover email
Peter Marko (3):
ffmpeg: set status for CVE-2025-10256
ffmpeg: set status for CVE-2025-12343
openssl: upgrade 3.2.6 -> 3.5.5
Shaik Moin (1):
gdk-pixbuf: Fix CVE-2025-6199
Tom Hochstein (1):
uboot-config: Fix devtool modify
Yoann Congal (2):
scripts/install-buildtools: Update to 5.0.16
README: Add scarthgap subject-prefix to git-send-email suggestion
README.OE-Core.md | 2 +-
meta/classes-recipe/uboot-config.bbclass | 2 +-
.../openssl/files/environment.d-openssl.sh | 9 ++-
...ke-history-reporting-when-test-fails.patch | 32 ++++----
...1-Configure-do-not-tweak-mips-cflags.patch | 4 +-
...sysroot-and-debug-prefix-map-from-co.patch | 26 ++++---
.../0001-extend-check_cwm-test-timeout.patch | 32 ++++++++
.../openssl/openssl/CVE-2024-41996.patch | 44 -----------
.../openssl/openssl/CVE-2025-15468.patch | 39 ----------
.../openssl/openssl/CVE-2025-69419.patch | 61 ---------------
.../{openssl_3.2.6.bb => openssl_3.5.5.bb} | 75 ++++++++++++-------
.../busybox/busybox/CVE-2025-60876.patch | 42 +++++++++++
meta/recipes-core/busybox/busybox_1.36.1.bb | 1 +
.../zlib/zlib/CVE-2026-27171.patch | 63 ++++++++++++++++
meta/recipes-core/zlib/zlib_1.3.1.bb | 1 +
.../gdk-pixbuf/gdk-pixbuf/CVE-2025-6199.patch | 36 +++++++++
.../gdk-pixbuf/gdk-pixbuf_2.42.12.bb | 1 +
.../harfbuzz/files/CVE-2026-22693.patch | 33 ++++++++
.../harfbuzz/harfbuzz_8.3.0.bb | 4 +-
.../recipes-multimedia/ffmpeg/ffmpeg_6.1.4.bb | 2 +-
scripts/create-pull-request | 2 +-
scripts/install-buildtools | 4 +-
22 files changed, 305 insertions(+), 210 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-41996.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2025-15468.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2025-69419.patch
rename meta/recipes-connectivity/openssl/{openssl_3.2.6.bb => openssl_3.5.5.bb} (76%)
create mode 100644 meta/recipes-core/busybox/busybox/CVE-2025-60876.patch
create mode 100644 meta/recipes-core/zlib/zlib/CVE-2026-27171.patch
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2025-6199.patch
create mode 100644 meta/recipes-graphics/harfbuzz/files/CVE-2026-22693.patchPATCH 1/11 gdk-pixbuf: Fix CVE-2025-6199
From: Shaik Moin <[email protected]>
Backport the fix for CVE-2025-6199
Add below patch to fix
CVE-2025-6199.patch
Reference: In Ubuntu and debian, fixed patch is given -> [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/c4986342b241cdc075259565f3fa7a7597d32a32]
--- .../gdk-pixbuf/gdk-pixbuf/CVE-2025-6199.patch | 36 +++++++++++++++++++ .../gdk-pixbuf/gdk-pixbuf_2.42.12.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2025-6199.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2025-6199.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 140200be0b4d5355aab76a6fd474e17d117045ca Mon Sep 17 00:00:00 2001 +From: lumi <[email protected]> +Date: Sat, 7 Jun 2025 22:27:06 +0200 +Subject: [PATCH] lzw: Fix reporting of bytes written in decoder + +When the LZW decoder encounters an invalid code, it stops +processing the image and returns the whole buffer size. +It should return the amount of bytes written, instead. + +Fixes #257 + +CVE: CVE-2025-6199 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/c4986342b241cdc075259565f3fa7a7597d32a32] + +Signed-off-by: Shaik Moin <[email protected]> +--- + gdk-pixbuf/lzw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c +index 15293560b..4f3dd8beb 100644 +--- a/gdk-pixbuf/lzw.c ++++ b/gdk-pixbuf/lzw.c +@@ -208,7 +208,7 @@ lzw_decoder_feed (LZWDecoder *self, + /* Invalid code received - just stop here */ + if (self->code >= self->code_table_size) { + self->last_code = self->eoi_code; +- return output_length; ++ return n_written; + } + + /* Convert codeword into indexes */ +-- +2.34.1 +
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://fatal-loader.patch \ file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ file://CVE-2025-7345.patch \ + file://CVE-2025-6199.patch \ " SRC_URI[sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7"
PATCH 2/11 ffmpeg: set status for CVE-2025-10256
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Per [1] is patch for this CVE [2].
This is equivalent of [3] which is included in n6.1.3.
[1] https://nvd.nist.gov/vuln/detail/CVE-2025-10256
[2] https://github.com/FFmpeg/FFmpeg/commit/a25462482c02c004d685a8fcf2fa63955aaa0931
[3] https://github.com/FFmpeg/FFmpeg/commit/00b5af29a4203a31574c11b3df892d78d5d862ec
--- meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.4.bb +1 -1
@@ -48,7 +48,7 @@ CVE_STATUS[CVE-2023-39018] = "cpe-incorrect: This issue belongs to ffmpeg-cli-wr CVE_STATUS[CVE-2025-1373] = "fixed-version: Vulnerable code not present in any release" CVE_STATUS_GROUPS += "CVE_STATUS_FIXED_61x" -CVE_STATUS_FIXED_61x = "CVE-2023-49502 CVE-2023-50007 CVE-2023-50008 CVE-2023-50009 CVE-2023-50010 CVE-2024-31578 CVE-2024-31582 CVE-2024-31585 CVE-2025-1594" +CVE_STATUS_FIXED_61x = "CVE-2023-49502 CVE-2023-50007 CVE-2023-50008 CVE-2023-50009 CVE-2023-50010 CVE-2024-31578 CVE-2024-31582 CVE-2024-31585 CVE-2025-1594 CVE-2025-10256" CVE_STATUS_FIXED_61x[status] = "cpe-incorrect:these CVEs are fixed in 6.1.x" CVE_STATUS[CVE-2025-25468] = "cpe-incorrect:vulnerability was introduced in v8.0"
PATCH 3/11 ffmpeg: set status for CVE-2025-12343
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Per [1] is patch for this CVE [2].
This is equivalent of [3] which is included in n6.1.3.
[1] https://security-tracker.debian.org/tracker/CVE-2025-12343
[2] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/b8d5f65b9e89d893f27cf00799dbc15fc0ca2f8e
[3] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/6250ed77a6fb5bb089e533e30985d197e8323dcf
--- meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.4.bb +1 -1
@@ -48,7 +48,7 @@ CVE_STATUS[CVE-2023-39018] = "cpe-incorrect: This issue belongs to ffmpeg-cli-wr CVE_STATUS[CVE-2025-1373] = "fixed-version: Vulnerable code not present in any release" CVE_STATUS_GROUPS += "CVE_STATUS_FIXED_61x" -CVE_STATUS_FIXED_61x = "CVE-2023-49502 CVE-2023-50007 CVE-2023-50008 CVE-2023-50009 CVE-2023-50010 CVE-2024-31578 CVE-2024-31582 CVE-2024-31585 CVE-2025-1594 CVE-2025-10256" +CVE_STATUS_FIXED_61x = "CVE-2023-49502 CVE-2023-50007 CVE-2023-50008 CVE-2023-50009 CVE-2023-50010 CVE-2024-31578 CVE-2024-31582 CVE-2024-31585 CVE-2025-1594 CVE-2025-10256 CVE-2025-12343" CVE_STATUS_FIXED_61x[status] = "cpe-incorrect:these CVEs are fixed in 6.1.x" CVE_STATUS[CVE-2025-25468] = "cpe-incorrect:vulnerability was introduced in v8.0"
Re: [scarthgap 03/11] ffmpeg: set status for CVE-2025-12343
Hi Peter,
As you mentioned, these CVEs do not affect version 6.1.x. You verified this. However, instead of doing these changes here, could we request that the NVD database be updated?
Thanks and regards,
Zahir
RE: [OE-core] [scarthgap 03/11] ffmpeg: set status for CVE-2025-12343
That’s a recurring question and my answer to it is unchanged - no. However, feel free to contribute to that direction yourself.
Peter
From: [email protected] <[email protected]> On Behalf Of aszh07 via lists.openembedded.org
Sent: Wednesday, March 11, 2026 10:10
To: [email protected]
Subject: Re: [OE-core] [scarthgap 03/11] ffmpeg: set status for CVE-2025-12343
Hi Peter,
As you mentioned, these CVEs do not affect version 6.1.x. You verified this. However, instead of doing these changes here, could we request that the NVD database be updated?
Thanks and regards,
Zahir
PATCH 4/11 zlib: Fix CVE-2026-27171
In reply to Yoann CongalFrom: Hugo SIMELIERE <[email protected]>
Pick patch from [1] also mentioned in [2]
[1] https://github.com/madler/zlib/issues/904
[2] https://security-tracker.debian.org/tracker/CVE-2026-27171
--- .../zlib/zlib/CVE-2026-27171.patch | 63 +++++++++++++++++++ meta/recipes-core/zlib/zlib_1.3.1.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta/recipes-core/zlib/zlib/CVE-2026-27171.patch
meta/recipes-core/zlib/zlib/CVE-2026-27171.patch new file +63 -0
@@ -0,0 +1,63 @@ +From f234bdf5c0f94b681312452fcd5e36968221fa04 Mon Sep 17 00:00:00 2001 +From: Mark Adler <[email protected]> +Date: Sun, 21 Dec 2025 18:17:56 -0800 +Subject: [PATCH] Check for negative lengths in crc32_combine functions. + +Though zlib.h says that len2 must be non-negative, this avoids the +possibility of an accidental infinite loop. + +Upstream-Status: Backport [https://github.com/madler/zlib/commit/ba829a458576d1ff0f26fc7230c6de816d1f6a77] +CVE: CVE-2026-27171 + +Signed-off-by: Hugo SIMELIERE <[email protected]> +--- + crc32.c | 4 ++++ + zlib.h | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/crc32.c b/crc32.c +index 6c38f5c..33d8c79 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -1019,6 +1019,8 @@ unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf, + + /* ========================================================================= */ + uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) { ++ if (len2 < 0) ++ return 0; + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +@@ -1032,6 +1034,8 @@ uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) { + + /* ========================================================================= */ + uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) { ++ if (len2 < 0) ++ return 0; + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +diff --git a/zlib.h b/zlib.h +index 8d4b932..8c7f8ac 100644 +--- a/zlib.h ++++ b/zlib.h +@@ -1758,14 +1758,14 @@ ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2); + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and +- len2. len2 must be non-negative. ++ len2. len2 must be non-negative, otherwise zero is returned. + */ + + /* + ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2); + + Return the operator corresponding to length len2, to be used with +- crc32_combine_op(). len2 must be non-negative. ++ crc32_combine_op(). len2 must be non-negative, otherwise zero is returned. + */ + + ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op); +-- +2.43.0 +
meta/recipes-core/zlib/zlib_1.3.1.bb +1 -0
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef6 SRC_URI = "https://zlib.net/${BP}.tar.gz \ file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ file://run-ptest \ + file://CVE-2026-27171.patch \ " UPSTREAM_CHECK_URI = "http://zlib.net/"
PATCH 5/11 harfbuzz: Fix CVE-2026-22693
In reply to Yoann CongalFrom: Hugo SIMELIERE <[email protected]>
Pick patch mentioned in NVD report [1]
[1] https://nvd.nist.gov/vuln/detail/CVE-2026-22693
--- .../harfbuzz/files/CVE-2026-22693.patch | 33 +++++++++++++++++++ .../harfbuzz/harfbuzz_8.3.0.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/harfbuzz/files/CVE-2026-22693.patch
meta/recipes-graphics/harfbuzz/files/CVE-2026-22693.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 95d38abd1293cae1f2aa700a3949288fd2c9a4c4 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <[email protected]> +Date: Fri, 9 Jan 2026 04:54:42 -0700 +Subject: [PATCH] [cmap] malloc fail test (#5710) + +Fixes https://github.com/harfbuzz/harfbuzz/security/advisories/GHSA-xvjr-f2r9-c7ww + +Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/1265ff8d990284f04d8768f35b0e20ae5f60daae] +CVE: CVE-2026-22693 + +Signed-off-by: Hugo SIMELIERE <[email protected]> +--- + src/hb-ot-cmap-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh +index e2e258185..2f7d72700 100644 +--- a/src/hb-ot-cmap-table.hh ++++ b/src/hb-ot-cmap-table.hh +@@ -1534,6 +1534,10 @@ struct SubtableUnicodesCache { + { + SubtableUnicodesCache* cache = + (SubtableUnicodesCache*) hb_malloc (sizeof(SubtableUnicodesCache)); ++ ++ if (unlikely (!cache)) ++ return nullptr; ++ + new (cache) SubtableUnicodesCache (source_table); + return cache; + } +-- +2.43.0 +
meta/recipes-graphics/harfbuzz/harfbuzz_8.3.0.bb +3 -1
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ " -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \ + file://CVE-2026-22693.patch \ + " SRC_URI[sha256sum] = "109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847" DEPENDS += "glib-2.0-native"
PATCH 6/11 openssl: upgrade 3.2.6 -> 3.5.5
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Openssl 3.2 has reached EOL.
Some projects would like to use LTS version due to criticality and exposure of this component, so upgrade to 3.5 branch.
Copy recipe from oe-core master fd3b1efb6f7ffb5505ff7eb95cae222e1db9f776 which is the last revision before disabling TLS 1/1.1 by default. Single change is replacing UNPACKDIR by WORKIDR (one occurence).
---
.../openssl/files/environment.d-openssl.sh | 9 ++-
...ke-history-reporting-when-test-fails.patch | 32 ++++----
...1-Configure-do-not-tweak-mips-cflags.patch | 4 +-
...sysroot-and-debug-prefix-map-from-co.patch | 26 ++++---
.../0001-extend-check_cwm-test-timeout.patch | 32 ++++++++
.../openssl/openssl/CVE-2024-41996.patch | 44 -----------
.../openssl/openssl/CVE-2025-15468.patch | 39 ----------
.../openssl/openssl/CVE-2025-69419.patch | 61 ---------------
.../{openssl_3.2.6.bb => openssl_3.5.5.bb} | 75 ++++++++++++-------
9 files changed, 119 insertions(+), 203 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-41996.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2025-15468.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2025-69419.patch
rename meta/recipes-connectivity/openssl/{openssl_3.2.6.bb => openssl_3.5.5.bb} (76%)meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +5 -4
@@ -1,14 +1,15 @@ -export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" +export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/openssl.cnf" export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" # Respect host env SSL_CERT_FILE/SSL_CERT_DIR first, then auto-detected host cert, then cert in buildtools -# CAFILE/CAPATH is auto-deteced when source buildtools +# CAFILE/CAPATH is auto-detected when source buildtools if [ -z "${SSL_CERT_FILE:-}" ]; then if [ -n "${CAFILE:-}" ];then export SSL_CERT_FILE="$CAFILE" elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs/ca-certificates.crt" fi fi
@@ -16,7 +17,7 @@ if [ -z "${SSL_CERT_DIR:-}" ]; then if [ -n "${CAPATH:-}" ];then export SSL_CERT_DIR="$CAPATH" elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs" fi fi
meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch +15 -17
@@ -6,18 +6,17 @@ Subject: [PATCH] Added handshake history reporting when test fails Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22481] Signed-off-by: William Lyu <[email protected]> -Signed-off-by: Siddharth Doshi <[email protected]> --- - test/helpers/handshake.c | 137 +++++++++++++++++++++++++++++---------- + test/helpers/handshake.c | 136 ++++++++++++++++++++++++++++++--------- test/helpers/handshake.h | 70 +++++++++++++++++++- test/ssl_test.c | 44 +++++++++++++ - 3 files changed, 217 insertions(+), 34 deletions(-) + 3 files changed, 217 insertions(+), 33 deletions(-) diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c -index e0422469e4..ae2ad59dd4 100644 +index f611b3a..5703b48 100644 --- a/test/helpers/handshake.c +++ b/test/helpers/handshake.c -@@ -24,6 +24,102 @@ +@@ -25,6 +25,102 @@ #include <netinet/sctp.h> #endif
@@ -120,7 +119,7 @@ index e0422469e4..ae2ad59dd4 100644 HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void) { HANDSHAKE_RESULT *ret; -@@ -725,15 +821,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client, +@@ -724,15 +820,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client, SSL_set_post_handshake_auth(client, 1); }
@@ -136,7 +135,7 @@ index e0422469e4..ae2ad59dd4 100644 /* An SSL object and associated read-write buffers. */ typedef struct peer_st { SSL *ssl; -@@ -1080,17 +1167,6 @@ static void do_shutdown_step(PEER *peer) +@@ -1077,16 +1164,6 @@ static void do_shutdown_step(PEER *peer) } }
@@ -149,12 +148,11 @@ index e0422469e4..ae2ad59dd4 100644 - SHUTDOWN, - CONNECTION_DONE -} connect_phase_t; -- - static int renegotiate_op(const SSL_TEST_CTX *test_ctx) { switch (test_ctx->handshake_mode) { -@@ -1168,19 +1244,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer, +@@ -1164,19 +1241,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer, } }
@@ -174,7 +172,7 @@ index e0422469e4..ae2ad59dd4 100644 /* * Determine the handshake outcome. * last_status: the status of the peer to have acted last. -@@ -1545,6 +1608,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( +@@ -1541,6 +1605,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( start = time(NULL);
@@ -185,8 +183,8 @@ index e0422469e4..ae2ad59dd4 100644 /* * Half-duplex handshake loop. * Client and server speak to each other synchronously in the same process. -@@ -1566,6 +1633,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( - 0 /* server went last */); +@@ -1562,6 +1630,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( + 0 /* server went last */); } + save_loop_history(&(ret->history),
@@ -197,7 +195,7 @@ index e0422469e4..ae2ad59dd4 100644 case HANDSHAKE_SUCCESS: client_turn_count = 0; diff --git a/test/helpers/handshake.h b/test/helpers/handshake.h -index 78b03f9f4b..b9967c2623 100644 +index 78b03f9..b9967c2 100644 --- a/test/helpers/handshake.h +++ b/test/helpers/handshake.h @@ -1,5 +1,5 @@
@@ -293,16 +291,16 @@ index 78b03f9f4b..b9967c2623 100644 HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void); @@ -95,4 +159,8 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, - CTX_DATA *server2_ctx_data, - CTX_DATA *client_ctx_data); + CTX_DATA *server2_ctx_data, + CTX_DATA *client_ctx_data); +const char *handshake_connect_phase_name(connect_phase_t phase); +const char *handshake_status_name(handshake_status_t handshake_status); +const char *handshake_peer_status_name(peer_status_t peer_status); + - #endif /* OSSL_TEST_HANDSHAKE_HELPER_H */ + #endif /* OSSL_TEST_HANDSHAKE_HELPER_H */ diff --git a/test/ssl_test.c b/test/ssl_test.c -index ea608518f9..9d6b093c81 100644 +index ea60851..9d6b093 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -26,6 +26,44 @@ static OSSL_LIB_CTX *libctx = NULL;
meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch +2 -2
@@ -17,10 +17,10 @@ Signed-off-by: Tim Orling <[email protected]> 1 file changed, 10 deletions(-) diff --git a/Configure b/Configure -index 4569952..adf019b 100755 +index fff97bd..5ee54c1 100755 --- a/Configure +++ b/Configure -@@ -1485,16 +1485,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) +@@ -1552,16 +1552,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) push @{$config{shared_ldflag}}, "-mno-cygwin"; }
meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch +15 -11
@@ -30,23 +30,26 @@ Update to fix buildpaths qa issue for '-ffile-prefix-map'. Signed-off-by: Khem Raj <[email protected]> --- - Configurations/unix-Makefile.tmpl | 12 +++++++++++- + Configurations/unix-Makefile.tmpl | 16 +++++++++++++++- crypto/build.info | 2 +- - 2 files changed, 12 insertions(+), 2 deletions(-) + 2 files changed, 16 insertions(+), 2 deletions(-) -Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl -=================================================================== ---- openssl-3.0.4.orig/Configurations/unix-Makefile.tmpl -+++ openssl-3.0.4/Configurations/unix-Makefile.tmpl -@@ -481,13 +481,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), +diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl +index 09303c4..011bda1 100644 +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -513,13 +513,27 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) -# CPPFLAGS_Q is used for one thing only: to build up buildinf.h +# *_Q variables are used for one thing only: to build up buildinf.h CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g; ++ $cppflags1 =~ s|-isystem/[^ ]+/usr/include||g; $cppflags2 =~ s|([\\"])|\\$1|g; ++ $cppflags2 =~ s|-isystem/[^ ]+/usr/include||g; $lib_cppflags =~ s|([\\"])|\\$1|g; ++ $lib_cppflags =~ s|-isystem/[^ ]+/usr/include||g; join(' ', $lib_cppflags || (), $cppflags2 || (), $cppflags1 || ()) -}
@@ -54,6 +57,7 @@ Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl + s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; + s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g; + s|-ffile-prefix-map=[^ ]+|-ffile-prefix-map=|g; ++ s|-isystem/[^ ]+/usr/include ||g; + } + join(' ', @{$config{CFLAGS}}) -} +
@@ -63,10 +67,10 @@ Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl PERLASM_SCHEME= {- $target{perlasm_scheme} -} # For x86 assembler: Set PROCESSOR to 386 if you want to support -Index: openssl-3.0.4/crypto/build.info -=================================================================== ---- openssl-3.0.4.orig/crypto/build.info -+++ openssl-3.0.4/crypto/build.info +diff --git a/crypto/build.info b/crypto/build.info +index aee5c46..95c9577 100644 +--- a/crypto/build.info ++++ b/crypto/build.info @@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF DEPEND[info.o]=buildinf.h
meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch new file +32 -0
@@ -0,0 +1,32 @@ +From c7000672296f4c367341aa3415f26c4d9f5e4749 Mon Sep 17 00:00:00 2001 +From: Gyorgy Sarvari <[email protected]> +Date: Thu, 23 Oct 2025 11:24:36 +0200 +Subject: [PATCH] extend check_cwm test timeout + +The default, 3s long test timeout isn't always enough for this +particular test in case there is a high load on the host machine +(assuming it is running in qemu). Extend the default timeout to 6s +for the check_cwm test to avoid timeouts. + +Upstream-Status: Inappropriate [upstream issue: https://github.com/openssl/openssl/issues/28983] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + test/radix/main.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/test/radix/main.c b/test/radix/main.c +index 4a1e886a71..39f8c61ef9 100644 +--- a/test/radix/main.c ++++ b/test/radix/main.c +@@ -25,6 +25,11 @@ static int test_script(int idx) + int testresult; + TERP_CONFIG cfg = { 0 }; + ++ // check_cwm test sometimes times out, the default 3000ms is ++ // not enough if the test execution starves for CPU ++ if (!strncmp("check_cwm", script_info->name, strlen("check_cwm"))) ++ cfg.max_execution_time = ossl_ms2time(6000); ++ + if (!TEST_true(bindings_process_init(0, 0))) + return 0; +
meta/recipes-connectivity/openssl/openssl/CVE-2024-41996.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2025-15468.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 1f08e54bad32843044fe8a675948d65e3b4ece65 Mon Sep 17 00:00:00 2001 -From: Daniel Kubec <[email protected]> -Date: Fri, 9 Jan 2026 14:33:24 +0100 -Subject: [PATCH] ossl_quic_get_cipher_by_char(): Add a NULL guard before - dereferencing SSL_CIPHER -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes CVE-2025-15468 - -Reviewed-by: Saša Nedvědický <[email protected]> -Reviewed-by: Tomas Mraz <[email protected]> -MergeDate: Mon Jan 26 19:36:04 2026 -(cherry picked from commit 293b55de0c434a99d0e744d0521170ca280606a9) - -CVE: CVE-2025-15468 -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/1f08e54bad32843044fe8a675948d65e3b4ece65] -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - ssl/quic/quic_impl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c -index 98b6a0a..4abde64 100644 ---- a/ssl/quic/quic_impl.c -+++ b/ssl/quic/quic_impl.c -@@ -3646,6 +3646,8 @@ const SSL_CIPHER *ossl_quic_get_cipher_by_char(const unsigned char *p) - { - const SSL_CIPHER *ciph = ssl3_get_cipher_by_char(p); - -+ if (ciph == NULL) -+ return NULL; - if ((ciph->algorithm2 & SSL_QUIC) == 0) - return NULL; - --- -2.50.1 -
meta/recipes-connectivity/openssl/openssl/CVE-2025-69419.patch deleted +0 -61
61 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl_3.5.5.bb renamed from meta/recipes-connectivity/openssl/openssl_3.2.6.bb +50 -25
162 lines not on this page · raw message
PATCH 7/11 scripts/install-buildtools: Update to 5.0.16
In reply to Yoann CongalFrom: Yoann Congal <[email protected]>
Update to the 5.0.16 release of the 5.0 series for buildtools
--- scripts/install-buildtools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/install-buildtools +2 -2
@@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto' -DEFAULT_RELEASE = 'yocto-5.0.15' -DEFAULT_INSTALLER_VERSION = '5.0.15' +DEFAULT_RELEASE = 'yocto-5.0.16' +DEFAULT_INSTALLER_VERSION = '5.0.16' DEFAULT_BUILDDATE = '202110XX' # Python version sanity check
PATCH 8/11 uboot-config: Fix devtool modify
In reply to Yoann CongalFrom: Tom Hochstein <[email protected]>
Fix a problem with devtool modify as suggested by Marcus Flyckt on the mailing list:
```
I encountered an issue with `do_config` when using `devtool modify`
on `u-boot-imx`.
```
[...]
| cp: cannot stat '[...]/u-boot-imx/2024.04/build/imx8mp_wl400s_defconfig/.config': No such file or directory
| WARNING: exit code 1 from a shell command.
ERROR: Task ([...]/sources/poky/../meta-freescale/recipes-bsp/u-boot/u-boot-imx_2024.04.bb:do_configure) failed with exit code '1'
NOTE: Tasks Summary: Attempted 963 tasks of which 962 didn't need to be rerun and 1 failed.
Summary: 1 task failed:
[...]/sources/poky/../meta-freescale/recipes-bsp/u-boot/u-boot-imx_2024.04.bb:do_configure
Summary: There was 1 ERROR message, returning a non-zero exit code
```
The issue seems to originate from the following lines in
`workspace/appends/u-boot-imx_2024.04.bbappend`:
```
do_configure:append() {
if [ ${@oe.types.boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG"))} = True ]; then
cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline
ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new
fi
}
```
For some reason `KCONFIG_CONFIG_ROOTDIR` does not point to the
correct directory. It gets its value in `uboot-config.bbclass`:
```
if len(ubootconfig) == 1:
d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip()))
```
So the main issue is that B gets expanded in this expression, and
then later B gets changed by `externalsrc.bbclass`.
`d.getVar("B", False)` does not solve the issue, however the
proposed change does.```
- https://lists.yoctoproject.org/g/yocto/topic/109254298#msg64152]
Fixes [YOCTO #15603]
--- meta/classes-recipe/uboot-config.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/uboot-config.bbclass +1 -1
@@ -149,7 +149,7 @@ python () { # Ensure the uboot specific menuconfig settings do not leak into other recipes if 'u-boot' in recipename: if len(ubootconfig) == 1: - d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) + d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join("${B}", d.getVar("UBOOT_MACHINE").strip())) else: # Disable menuconfig for multiple configs d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false")
PATCH 9/11 README: Add scarthgap subject-prefix to git-send-email suggestion
In reply to Yoann CongalFrom: Yoann Congal <[email protected]>
That might help new users send correct first stable patches.
--- README.OE-Core.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
README.OE-Core.md +1 -1
@@ -22,7 +22,7 @@ for full details on how to submit changes. As a quick guide, patches should be sent to [email protected] The git command to do that would be: - git send-email -M -1 --to [email protected] + git send-email -M -1 --to [email protected] --subject-prefix='scarthgap][PATCH' Mailing list:
PATCH 10/11 create-pull-request: Keep commit hash to be pulled in cover email
In reply to Yoann CongalFrom: Paul Barker <[email protected]>
The cover email mangling in create-pull-request was cutting off the actual commit hash to be pulled, making it difficult to verify that the changes a maintainer merges exactly match those intended by the pull request author.
The extra lines we want to include are, for example from a recent whinlatter stable branch PR:
for you to fetch changes up to 6c4c6d39ea3202d756acc13f8ce81b114a468541:
cups: upgrade from 2.4.14 to 2.4.15 (2025-12-29 09:49:31 -0800)--- scripts/create-pull-request | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/create-pull-request +1 -1
@@ -219,7 +219,7 @@ fi # The cover letter already has a diffstat, remove it from the pull-msg # before inserting it. -sed -n "0,\#$REMOTE_URL# p" "$PM" | sed -i "/BLURB HERE/ r /dev/stdin" "$CL" +sed -n "0,\#^----------------------------------------------------------------# p" "$PM" | sed -i "/BLURB HERE/ r /dev/stdin" "$CL" rm "$PM" # If this is an RFC, make that clear in the cover letter
PATCH 11/11 busybox: Fixes CVE-2025-60876
In reply to Yoann CongalFrom: Livin Sunny <[email protected]>
This addresses CVE-2025-60876[1], which allows malicious URLs to inject HTTP headers. It has been accepted by Debian[2] and is tracked here [4]. The upstream fix has been submitted [3] and is pending merge.
[1] https://nvd.nist.gov/vuln/detail/CVE-2025-60876
[2] https://bugs.debian.org/1120795
[3] https://lists.busybox.net/pipermail/busybox/2025-November/091840.html
[4] https://security-tracker.debian.org/tracker/CVE-2025-60876
Upstream-Status: Submitted [https://lists.busybox.net/pipermail/busybox/2025-November/0918
40.html]
--- .../busybox/busybox/CVE-2025-60876.patch | 42 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.36.1.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2025-60876.patch
meta/recipes-core/busybox/busybox/CVE-2025-60876.patch new file +42 -0
@@ -0,0 +1,42 @@ +From: Radoslav Kolev <[email protected]> +Date: Fri, 21 Nov 2025 11:21:18 +0200 +Subject: wget: don't allow control characters or spaces in the URL +Bug-Debian: https://bugs.debian.org/1120795 + +Fixes CVE-2025-60876 malicious URL can be used to inject +HTTP headers in the request. + +Signed-off-by: Radoslav Kolev <[email protected]> +Reviewed-by: Emmanuel Deloget <[email protected]> + +Upstream-Status: Submitted [https://lists.busybox.net/pipermail/busybox/2025-November/091840.html] + +CVE: CVE-2025-60876 + +Signed-off-by: Livin Sunny <[email protected]> +--- + networking/wget.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/networking/wget.c b/networking/wget.c +index ec3767793..fa555427b 100644 +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -536,6 +536,15 @@ static void parse_url(const char *src_url, struct host_info *h) + { + char *url, *p, *sp; + ++ /* Fix for CVE-2025-60876 - don't allow control characters or spaces in the URL */ ++ /* otherwise a malicious URL can be used to inject HTTP headers in the request */ ++ const unsigned char *u = (void *) src_url; ++ while (*u) { ++ if (*u <= ' ') ++ bb_simple_error_msg_and_die("Unencoded control character found in the URL!"); ++ u++; ++ } ++ + free(h->allocated); + h->allocated = url = xstrdup(src_url); + +-- +2.47.3
meta/recipes-core/busybox/busybox_1.36.1.bb +1 -0
@@ -61,6 +61,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2023-39810.patch \ file://CVE-2025-46394-01.patch \ file://CVE-2025-46394-02.patch \ + file://CVE-2025-60876.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " # TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
Quoted 47 lines · Yoann Congal via lists.openembedded.org
Note: this series contains a major OpenSSL upgrade (agreed by YP TSC).
Please review this set of changes for scarthgap and have comments back by end of day Tuesday, March 10.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3349
(Ignore the warning about Centos Stream9, its support is a work in progress for scarthgap)I also did a full meta-oe build (to check for build failure with the OpenSSL upgrade)
https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/1342
(the warnings are unrelated to this series)The following changes since commit
a9a785d7fa0cfe2a9087dbcde0ef9f0d2a441375:build-appliance-image: Update to scarthgap head revision (2026-02-27 17:45:15 +0000)
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-nutfor you to fetch changes up to
fd8a140eb0742bbc12a23e36c9d24378bc0f462d:busybox: Fixes CVE-2025-60876 (2026-03-06 23:58:42 +0100)
----------------------------------------------------------------
Hugo SIMELIERE (2):
zlib: Fix CVE-2026-27171
harfbuzz: Fix CVE-2026-22693Livin Sunny (1):
busybox: Fixes CVE-2025-60876Paul Barker (1):
create-pull-request: Keep commit hash to be pulled in cover emailPeter Marko (3):
ffmpeg: set status for CVE-2025-10256
ffmpeg: set status for CVE-2025-12343
openssl: upgrade 3.2.6 -> 3.5.5Shaik Moin (1):
gdk-pixbuf: Fix CVE-2025-6199
Quoted 6 lines
Tom Hochstein (1):
uboot-config: Fix devtool modifyYoann Congal (2):
scripts/install-buildtools: Update to 5.0.16
README: Add scarthgap subject-prefix to git-send-email suggestion
Hi Yoann,
We need to make sure that the openssl update is clearly announced in the weekly status and the release notes for 5.0.17. Otherwise, all LGTM!
Best regards,
Signature · 1 line
Paul Barker