[kirkstone,18/29] busybox: Fix depmod patch

Message ID	03e437782b1b295334a95cea8678fc425cafe9d3.1677859897.git.steve@sakoman.com
State	New, archived
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.216.45, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/29] busybox: Fix depmod patch Date: Fri, 3 Mar 2023 06:17:16 -1000 Message-Id: <03e437782b1b295334a95cea8678fc425cafe9d3.1677859897.git.steve@sakoman.com> In-Reply-To: <cover.1677859897.git.steve@sakoman.com> References: <cover.1677859897.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[kirkstone,01/29] binutils : Fix CVE-2023-22608 \| expand [kirkstone,01/29] binutils : Fix CVE-2023-22608 [kirkstone,02/29] harfbuzz: fix CVE-2023-25193 allows attackers to trigger O(n^2) growth via consec… [kirkstone,03/29] libsdl2: fix CVE-2022-4743 [kirkstone,04/29] less: backport the fix for CVE-2022-46663 [kirkstone,05/29] package.bbclase: Add check for /build in copydebugsources() [kirkstone,06/29] xserver-xorg: 21.1.6 -> 21.1.7 [kirkstone,07/29] vim: update 9.0.1211 -> 9.0.1293 to resolve open CVEs [kirkstone,08/29] libjpeg-turbo: upgrade 2.1.5 -> 2.1.5.1 [kirkstone,09/29] xwayland: upgrade 22.1.7 -> 22.1.8 [kirkstone,10/29] dbus: upgrade 1.14.4 -> 1.14.6 [kirkstone,11/29] openssl: Upgrade 3.0.7 -> 3.0.8 [kirkstone,12/29] linux-firmware: properly set license for all Qualcomm firmware [kirkstone,13/29] linux-firmware: add yamato fw files to qcom-adreno-a2xx package [kirkstone,14/29] linux-firmware: upgrade 20230117 -> 20230210 [kirkstone,15/29] wireless-regdb: upgrade 2022.08.12 -> 2023.02.13 [kirkstone,16/29] curl: fix dependencies when building with ldap/ldaps [kirkstone,17/29] wic: Fix usage of fstype=none in wic [kirkstone,18/29] busybox: Fix depmod patch [kirkstone,19/29] sstatesig: Improve output hash calculation [kirkstone,20/29] dhcpcd: fix dhcpcd start failure on qemuppc64 [kirkstone,21/29] lttng-modules: fix for kernel 6.2+ [kirkstone,22/29] libssh2: Clean up ptest patch/coverage [kirkstone,23/29] oeqa/selftest/resulttooltests: fix minor typo [kirkstone,24/29] lib/buildstats: handle tasks that never finished [kirkstone,25/29] kernel-yocto: fix kernel-meta data detection [kirkstone,26/29] libseccomp: fix for the ptest result format [kirkstone,27/29] oeqa ssh.py: fix hangs in run() [kirkstone,28/29] runqemu: kill qemu if it hangs [kirkstone,29/29] nghttp2: never build python bindings

Message ID

03e437782b1b295334a95cea8678fc425cafe9d3.1677859897.git.steve@sakoman.com

State

New, archived

Headers

From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][kirkstone 18/29] busybox: Fix depmod patch
Date: Fri,  3 Mar 2023 06:17:16 -1000
Message-Id: 
 <03e437782b1b295334a95cea8678fc425cafe9d3.1677859897.git.steve@sakoman.com>
In-Reply-To: <cover.1677859897.git.steve@sakoman.com>
References: <cover.1677859897.git.steve@sakoman.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[kirkstone,01/29] binutils : Fix CVE-2023-22608 | expand

Commit Message

Steve Sakoman March 3, 2023, 4:17 p.m. UTC

From: Saul Wold <Saul.Wold@windriver.com>

The original patch was actually allowing .debug modules
though which was in-correct. This change blocks the
parsing of .debug modules (which is correct). As noted in
[YOCTO #15022] this should address the empty modules.dep
when using the BusyBox depmod.

Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 339c3c3abe8d405cfe7b3f34db9b3547bcaaf878)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 .../busybox/busybox/0001-depmod-Ignore-.debug-directories.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch
index 354f83a4a5..d76118f85b 100644
--- a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch
+++ b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch
@@ -21,7 +21,7 @@  index bb42bbe..aa5a2de 100644
  	/* Arbitrary. Was sb->st_size, but that breaks .gz etc */
  	size_t len = (64*1024*1024 - 4096);
  
-+	if (strstr(fname, ".debug") == NULL)
++	if (strstr(fname, ".debug") != NULL)
 +		return TRUE;
 +
  	if (strrstr(fname, ".ko") == NULL)

[kirkstone,18/29] busybox: Fix depmod patch

Commit Message

Patch