Patch review
cover Patch review
Please review this set of changes for kirkstone and have comments back by end of day Monday, October 21
Passed a-full on autobuilder:
https://valkyrie.yoctoproject.org/#/builders/29/builds/283
The following changes since commit f09fca692f96c9c428e89c5ef53fbcb92ac0c9bf:
build-appliance-image: Update to kirkstone head revision (2024-10-12 05:20:21 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/kirkstone-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
Ashish Sharma (1):
libarchive: Fix CVE-2024-48957 & CVE-2024-48958
Khem Raj (1):
syslinux: Disable error on implicit-function-declaration
Macpaul Lin (1):
linux-firmware: upgrade 20240220 -> 20240909
Peter Marko (1):
gcc: ignore CVE-2023-4039
Randolph Sapp (1):
kmscube: create_framebuffer: backport modifier fix
meta/recipes-devtools/gcc/gcc-11.5.inc | 3 ++
.../syslinux/syslinux_6.04-pre2.bb | 2 +-
.../libarchive/CVE-2024-48957.patch | 33 +++++++++++++++++
.../libarchive/CVE-2024-48958.patch | 37 +++++++++++++++++++
.../libarchive/libarchive_3.6.2.bb | 2 +
...common.c-do-not-use-invalid-modifier.patch | 31 ++++++++++++++++
meta/recipes-graphics/kmscube/kmscube_git.bb | 1 +
...20240220.bb => linux-firmware_20240909.bb} | 8 ++--
8 files changed, 112 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch
create mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240220.bb => linux-firmware_20240909.bb} (99%)Signature · 1 line
2.34.1
PATCH 1/5 gcc: ignore CVE-2023-4039
From: Peter Marko <[email protected]>
Last version bump removed patch for this CVE because it was integrated in new release. This has caused the CVE to reappear in reports because 2023-09-12 is "higher" than 11.5...
--- meta/recipes-devtools/gcc/gcc-11.5.inc | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/gcc/gcc-11.5.inc +3 -0
@@ -121,3 +121,6 @@ EXTRA_OECONF_PATHS = "\ # Is a binutils 2.26 issue, not gcc CVE_CHECK_IGNORE += "CVE-2021-37322" + +# This is fixed by commit 75c37e0314, nvd uses arm versioning (2023-09-12) which will alway be higher than 11.x +CVE_CHECK_IGNORE += "CVE-2023-4039"
Signature · 1 line
2.34.1
PATCH 2/5 libarchive: Fix CVE-2024-48957 & CVE-2024-48958
In reply to Steve SakomanFrom: Ashish Sharma <[email protected]>
Backport fix:
* CVE-2024-48957 - Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b
* CVE-2024-48958 - Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/a1cb648d52f5b6d3f31184d9b6a7cbca628459b7
--- .../libarchive/CVE-2024-48957.patch | 33 +++++++++++++++++ .../libarchive/CVE-2024-48958.patch | 37 +++++++++++++++++++ .../libarchive/libarchive_3.6.2.bb | 2 + 3 files changed, 72 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch
meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b Mon Sep 17 00:00:00 2001 +From: Wei-Cheng Pan <[email protected]> +Date: Mon, 29 Apr 2024 06:53:19 +0900 +Subject: [PATCH] fix: OOB in rar audio filter (#2149) + +This patch ensures that `src` won't move ahead of `dst`, so `src` will +not OOB. Similar situation like in a1cb648. + +CVE: CVE-2024-48957 +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b] +Signed-off-by: Ashish Sharma <[email protected]> + + libarchive/archive_read_support_format_rar.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 619ee81e2..4fc6626ca 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -3722,6 +3722,13 @@ execute_filter_audio(struct rar_filter *filter, struct rar_virtual_machine *vm) + memset(&state, 0, sizeof(state)); + for (j = i; j < length; j += numchannels) + { ++ /* ++ * The src block should not overlap with the dst block. ++ * If so it would be better to consider this archive is broken. ++ */ ++ if (src >= dst) ++ return 0; ++ + int8_t delta = (int8_t)*src++; + uint8_t predbyte, byte; + int prederror;
meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch new file +37 -0
@@ -0,0 +1,37 @@ +From a1cb648d52f5b6d3f31184d9b6a7cbca628459b7 Mon Sep 17 00:00:00 2001 +From: Wei-Cheng Pan <[email protected]> +Date: Mon, 29 Apr 2024 06:50:22 +0900 +Subject: [PATCH] fix: OOB in rar delta filter (#2148) + +Ensure that `src` won't move ahead of `dst`, so `src` will not OOB. +Since `dst` won't move in this function, and we are only increasing `src` +position, this check should be enough. It should be safe to early return +because this function does not allocate resources. + +CVE: CVE-2024-48958 +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/a1cb648d52f5b6d3f31184d9b6a7cbca628459b7] +Signed-off-by: Ashish Sharma <[email protected]> + + libarchive/archive_read_support_format_rar.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 79669a8f4..619ee81e2 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -3612,7 +3612,15 @@ execute_filter_delta(struct rar_filter *filter, struct rar_virtual_machine *vm) + { + uint8_t lastbyte = 0; + for (idx = i; idx < length; idx += numchannels) ++ { ++ /* ++ * The src block should not overlap with the dst block. ++ * If so it would be better to consider this archive is broken. ++ */ ++ if (src >= dst) ++ return 0; + lastbyte = dst[idx] = lastbyte - *src++; ++ } + } + + filter->filteredblockaddress = length;
meta/recipes-extended/libarchive/libarchive_3.6.2.bb +2 -0
@@ -31,6 +31,8 @@ EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-pax-writer-fix-multiple-security-vulnerabilities.patch \ file://CVE-2024-26256.patch \ + file://CVE-2024-48957.patch \ + file://CVE-2024-48958.patch \ " UPSTREAM_CHECK_URI = "http://libarchive.org/"
Signature · 1 line
2.34.1
PATCH 3/5 linux-firmware: upgrade 20240220 -> 20240909
In reply to Steve SakomanFrom: Macpaul Lin <[email protected]>
License-Update: additional files
---
...ux-firmware_20240220.bb => linux-firmware_20240909.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240220.bb => linux-firmware_20240909.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb +4 -4
@@ -78,7 +78,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ + file://LICENSE.amdgpu;md5=1433dfea38c97a2e563a248a863dcb94 \ file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \
@@ -135,7 +135,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \ file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ - file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ + file://LICENCE.ti-connectivity;md5=3b1e9cf54aba8146dad4b735777d406f \ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \
@@ -147,7 +147,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "a344e6c28970fc7daafa81c10247aeb6" +WHENCE_CHKSUM = "6ae5ffd807c84809977286ad0b37acdb" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source
@@ -231,7 +231,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "bf0f239dc0801e9d6bf5d5fb3e2f549575632cf4688f4348184199cb02c2bcd7" +SRC_URI[sha256sum] = "943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671" inherit allarch
Signature · 1 line
2.34.1
PATCH 4/5 syslinux: Disable error on implicit-function-declaration
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
syslinux has vendored copy of ext2fs/ext2_fs.h but uses ext2fs/ext2fs.h from e2fsprogs package, however, ext2fs/ext2fs.h has dependencies on ext2fs/ext2_fs.h coming from e2fsprogs package as these both headers come from same package, here syslinux uses ext2fs.h from e2fsprogs but supplies its own copy of ext2_fs.h which maybe out of sync and that results in warnings about implicit implicit-function-declarations e.g.
recipe-sysroot/usr/include/ext2fs/ext2fs.h:727:16: error: implicit declaration of function 'ext2fs_has_feature_gdt_csum' [-Wimplicit-function-declaration]
| 727 | ext2fs_has_feature_gdt_csum(fs->super); | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
ext2fs_has_feature_gdt_csum here comes from newer version of ext2fs/ext2_fs.h but missing from vendored copy, hence the warning.
With gcc-14 this warning is treated as error by default, which breaks the build, so lets treat it as warning only.
All these functions are never used in syslinux, so functionality-wise we are fine.
--- meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +1 -1
@@ -48,7 +48,7 @@ TARGET_LDFLAGS = "" SECURITY_LDFLAGS = "" LDFLAGS_SECTION_REMOVAL = "" -CFLAGS:append = " -DNO_INLINE_FUNCS" +CFLAGS:append = " -DNO_INLINE_FUNCS -Wno-error=implicit-function-declaration" EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
Signature · 1 line
2.34.1
PATCH 5/5 kmscube: create_framebuffer: backport modifier fix
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
Backport the upstream buffer modifier fix for create_framebuffer to handle the case where no valid modifiers are available.
--- ...common.c-do-not-use-invalid-modifier.patch | 31 +++++++++++++++++++ meta/recipes-graphics/kmscube/kmscube_git.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch
meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 23e3ab9b32258bfffd302769fdd290008da8277e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 8 Aug 2022 20:22:39 +0200 +Subject: [PATCH] drm-common.c: do not use invalid modifier + +Prior to kernel 5.19 this was a soft failure, but 5.19 +adds checks that result in a hard syscall fail. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/kmscube/-/commit/23e3ab9b32258bfffd302769fdd290008da8277e] +Signed-off-by: Randolph Sapp <[email protected]> + +--- + drm-common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drm-common.c b/drm-common.c +index eb5ac20..e736922 100644 +--- a/drm-common.c ++++ b/drm-common.c +@@ -92,7 +92,7 @@ struct drm_fb * drm_fb_get_from_bo(struct gbm_bo *bo) + modifiers[i] = modifiers[0]; + } + +- if (modifiers[0]) { ++ if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) { + flags = DRM_MODE_FB_MODIFIERS; + printf("Using modifier %" PRIx64 "\n", modifiers[0]); + } +-- +2.46.0 +
meta/recipes-graphics/kmscube/kmscube_git.bb +1 -0
@@ -14,6 +14,7 @@ SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ file://0001-texturator-Use-correct-GL-extension-header.patch \ file://0001-common-fix-cast-type-in-init_egl.patch \ + file://0001-drm-common.c-do-not-use-invalid-modifier.patch \ " UPSTREAM_CHECK_COMMITS = "1"
Signature · 1 line
2.34.1