Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Friday, August 9
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7220
with the exception of a load related parsing failure on qemuarm64-armhost which passed on subsequent re-test:
https://autobuilder.yoctoproject.org/typhoon/#/builders/97/builds/8717
The following changes since commit 136a25567499191b23a4d000a06bf83a473224ca:
rust: Add new varaible RUST_ENABLE_EXTRA_TOOLS (2024-08-03 11:45:57 -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
Archana Polampalli (1):
ffmpeg: fix CVE-2024-31582
Ashish Sharma (1):
bind: Upgrade 9.18.25 -> 9.18.28
Changqing Li (2):
curl: correct the PACKAGECONFIG for native/nativesdk
libpng: update SRC_URI
Peter Marko (4):
curl: Patch CVE-2024-6197
glibc: cleanup old cve status
qemu: set cve status for CVE-2023-6683
libmnl: explicitly disable doxygen
Richard Purdie (1):
nasm: Upgrade 2.16.01 -> 2.16.03
Wang Mingyu (1):
orc: upgrade 0.4.38 -> 0.4.39
.../bind/{bind_9.18.25.bb => bind_9.18.28.bb} | 2 +-
meta/recipes-core/glibc/glibc-version.inc | 2 --
.../nasm/{nasm_2.16.01.bb => nasm_2.16.03.bb} | 2 +-
.../orc/{orc_0.4.38.bb => orc_0.4.39.bb} | 2 +-
meta/recipes-devtools/qemu/qemu.inc | 2 ++
meta/recipes-extended/libmnl/libmnl_1.0.5.bb | 2 ++
.../ffmpeg/ffmpeg/CVE-2024-31582.patch | 34 +++++++++++++++++++
.../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 +
.../libpng/libpng_1.6.42.bb | 2 +-
.../curl/curl/CVE-2024-6197.patch | 24 +++++++++++++
meta/recipes-support/curl/curl_8.7.1.bb | 5 +--
11 files changed, 70 insertions(+), 8 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.18.25.bb => bind_9.18.28.bb} (97%)
rename meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.03.bb} (88%)
rename meta/recipes-devtools/orc/{orc_0.4.38.bb => orc_0.4.39.bb} (92%)
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31582.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2024-6197.patchSignature · 1 line
2.34.1
PATCH 1/10 curl: Patch CVE-2024-6197
From: Peter Marko <[email protected]>
Picked commit per https://curl.se/docs/CVE-2024-6197.html
--- .../curl/curl/CVE-2024-6197.patch | 24 +++++++++++++++++++ meta/recipes-support/curl/curl_8.7.1.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2024-6197.patch
meta/recipes-support/curl/curl/CVE-2024-6197.patch new file +24 -0
@@ -0,0 +1,24 @@ +From 3a537a4db9e65e545ec45b1b5d5575ee09a2569d Mon Sep 17 00:00:00 2001 +From: z2_ <[email protected]> +Date: Fri, 28 Jun 2024 14:45:47 +0200 +Subject: [PATCH] x509asn1: remove superfluous free() + +CVE: CVE-2024-6197 +Upstream-Status: Backport [https://github.com/curl/curl/commit/3a537a4db9e65e545ec45b1b5d5575ee09a2569d.patch] +Signed-off-by: Peter Marko <[email protected]> +--- + lib/vtls/x509asn1.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c +index f71ab0b90a5931..1bc4243ddae343 100644 +--- a/lib/vtls/x509asn1.c ++++ b/lib/vtls/x509asn1.c +@@ -393,7 +393,6 @@ utf8asn1str(struct dynbuf *to, int type, const char *from, const char *end) + if(wc >= 0x00000800) { + if(wc >= 0x00010000) { + if(wc >= 0x00200000) { +- free(buf); + /* Invalid char. size for target encoding. */ + return CURLE_WEIRD_SERVER_REPLY; + }
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI = " \ file://run-ptest \ file://disable-tests \ file://no-test-timeout.patch \ + file://CVE-2024-6197.patch \ " SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"
Signature · 1 line
2.34.1
PATCH 2/10 glibc: cleanup old cve status
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
This CVE status should have been removed on version update. CPE says >=2.34 and <2.39 while our version is already 2.39.
(From OE-Core rev: b568a8f428e76f75bb8c374983f62822325ebe8a)
--- meta/recipes-core/glibc/glibc-version.inc | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-core/glibc/glibc-version.inc +0 -2
@@ -6,5 +6,3 @@ SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)" - -CVE_STATUS[CVE-2023-4911] = "fixed-version: Fixed in stable branch updates"
Signature · 1 line
2.34.1
PATCH 3/10 qemu: set cve status for CVE-2023-6683
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
This CVE is fixed in v8.2.2 with v8.2.1-55-g480a6adc83
https://github.com/qemu/qemu/commit/480a6adc83a7bbc84bfe67229e084603dc061824
--- meta/recipes-devtools/qemu/qemu.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +2 -0
@@ -74,6 +74,8 @@ CVE_STATUS[CVE-2023-3019] = "cpe-incorrect: Applies only against versions before CVE_STATUS[CVE-2023-5088] = "cpe-incorrect: Applies only against version 8.2.0 and earlier" +CVE_STATUS[CVE-2023-6683] = "cpe-incorrect: Applies only against version 8.2.1 and earlier" + CVE_STATUS[CVE-2023-6693] = "cpe-incorrect: Applies only against version 8.2.0 and earlier" COMPATIBLE_HOST:mipsarchn32 = "null"
Signature · 1 line
2.34.1
PATCH 4/10 ffmpeg: fix CVE-2024-31582
In reply to Steve SakomanFrom: Archana Polampalli <[email protected]>
--- .../ffmpeg/ffmpeg/CVE-2024-31582.patch | 34 +++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31582.patch
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31582.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 1d1a05b393ece9fa3df825bfef3724b7370aefdc Mon Sep 17 00:00:00 2001 +From: Zhao Zhili <[email protected]> +Date: Fri, 29 Dec 2023 05:56:43 +0800 +Subject: [PATCH] avfilter/vf_codecview: fix heap buffer overflow + +And improve the performance by a little bit. + +Signed-off-by: Zhao Zhili <[email protected]> + +CVE: CVE-2024-31582 + +Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/99debe5f823f45a482e1dc08de35879aa9c74bd2] + +Signed-off-by: Archana Polampalli <[email protected]> +--- + libavfilter/vf_codecview.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c +index 55d9c8c..f65ccbd 100644 +--- a/libavfilter/vf_codecview.c ++++ b/libavfilter/vf_codecview.c +@@ -216,9 +216,6 @@ static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, ptr + buf[sx + w - 1] = color; + buf += stride; + } +- +- for (int x = sx; x < sx + w; x++) +- buf[x] = color; + } + + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) +-- +2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +1 -0
@@ -29,6 +29,7 @@ SRC_URI = " \ file://vulkan_fix_gcc14.patch \ file://CVE-2023-49502.patch \ file://CVE-2024-31578.patch \ + file://CVE-2024-31582.patch \ " SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
Signature · 1 line
2.34.1
PATCH 5/10 nasm: Upgrade 2.16.01 -> 2.16.03
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Removes CVE-2022-46456 from reports.
(From OE-Core rev: 4a5b6e8dd315b2281afb232410db585d431be00f)
---
meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.03.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.03.bb} (88%)meta/recipes-devtools/nasm/nasm_2.16.03.bb renamed from meta/recipes-devtools/nasm/nasm_2.16.01.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ file://0002-Add-debug-prefix-map-option.patch \ " -SRC_URI[sha256sum] = "35b6ad2ee048d41c4779f073f3efca7762a822b7d2d4ef4e8df24cf65747bb2e" +SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" EXTRA_AUTORECONF:append = " -I autoconf/m4"
Signature · 1 line
2.34.1
PATCH 6/10 orc: upgrade 0.4.38 -> 0.4.39
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
---
meta/recipes-devtools/orc/{orc_0.4.38.bb => orc_0.4.39.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/orc/{orc_0.4.38.bb => orc_0.4.39.bb} (92%)meta/recipes-devtools/orc/orc_0.4.39.bb renamed from meta/recipes-devtools/orc/orc_0.4.38.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1400bd9d09e8af56b9ec982b3d85797e" SRC_URI = "http://gstreamer.freedesktop.org/src/orc/orc-${PV}.tar.xz" -SRC_URI[sha256sum] = "a55a98d4772567aa3faed8fb84d540c3db77eaba16d3e2e10b044fbc9228668d" +SRC_URI[sha256sum] = "33ed2387f49b825fa1b9c3b0072e05f259141b895474ad085ae51143d3040cc0" inherit meson pkgconfig gtk-doc
Signature · 1 line
2.34.1
PATCH 7/10 bind: Upgrade 9.18.25 -> 9.18.28
In reply to Steve SakomanFrom: Ashish Sharma <[email protected]>
Includes security fixes for:
CVE-2024-1975 CVE-2024-1737 CVE-2024-0760 CVE-2024-4076
Changelog:
=========
https://gitlab.isc.org/isc-projects/bind9/-/blob/v9.18.28/CHANGES
---
.../bind/{bind_9.18.25.bb => bind_9.18.28.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind_9.18.25.bb => bind_9.18.28.bb} (97%)meta/recipes-connectivity/bind/bind_9.18.28.bb renamed from meta/recipes-connectivity/bind/bind_9.18.25.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "5a4a70432a33d009f0e6e9dbb328aae7a5e27507e98e28bf3c0c6b250ccb2ab3" +SRC_URI[sha256sum] = "e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2
Signature · 1 line
2.34.1
PATCH 8/10 curl: correct the PACKAGECONFIG for native/nativesdk
In reply to Steve SakomanFrom: Changqing Li <[email protected]>
Since commit 148de08220 [ curl: Update from 8.2.1 to 8.3.0 ], --enable-crypto-auth option was removed and split into separate options for basic-auth, bearer-auth, digest-auth, kerberos-auth negotiate-auth, and aws. In this commit, --enable-crypto-auth is removed from EXTRA_OECONF, and the separate options is added into PACKAGECONFIG for target. But not added into PACKAGECONFIG for native/nativesdk, this make curl/git in buildtools not works well to connect basic auth https server.
Failed commands:
git ls-remote https://xxx(input username/passwd)
curl -u name:passwd https://xxx
Error:
Authentication failed xxx
HTTP/1.1 401 Unauthorized
--- meta/recipes-support/curl/curl_8.7.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/curl/curl_8.7.1.bb +2 -2
@@ -28,8 +28,8 @@ inherit autotools pkgconfig binconfig multilib_header ptest RANDOM ?= "/dev/urandom" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" -PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" -PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" +PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib aws basic-auth bearer-auth digest-auth negotiate-auth" +PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib aws basic-auth bearer-auth digest-auth negotiate-auth" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"
Signature · 1 line
2.34.1
PATCH 9/10 libmnl: explicitly disable doxygen
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
libmnl autoconf autodetects doxygen to generate manpages. If doxygen is provided via hosttools, the build fails. Also until now manpages were not needed.
So explicitly disable doxygen in configure step.
(From OE-Core rev: 8d7bbf4d6936d831e341e9443a6b3711be09c7ab)
--- meta/recipes-extended/libmnl/libmnl_1.0.5.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/libmnl/libmnl_1.0.5.bb +2 -0
@@ -11,4 +11,6 @@ SRC_URI[sha256sum] = "274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b4 inherit autotools pkgconfig +EXTRA_OECONF += "--with-doxygen=no" + BBCLASSEXTEND = "native"
Signature · 1 line
2.34.1
PATCH 10/10 libpng: update SRC_URI
In reply to Steve SakomanFrom: Changqing Li <[email protected]>
update SRC_URI to fix do_fetch warning:
WARNING: libpng-1.6.42-r0 do_fetch: Failed to fetch URL https://downloads.sourceforge.net/project/libpng/libpng16/libpng-1.6.42.tar.xz, attempting MIRRORS if available
--- meta/recipes-multimedia/libpng/libpng_1.6.42.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/libpng/libpng_1.6.42.bb +1 -1
@@ -10,7 +10,7 @@ DEPENDS = "zlib" LIBV = "16" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz" SRC_URI[sha256sum] = "c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450" MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
Signature · 1 line
2.34.1