summaryrefslogtreecommitdiff
path: root/meta-arm
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2024-07-12 18:58:04 +0300
committerPatrick Williams <patrick@stwcx.xyz>2024-07-12 19:41:04 +0300
commitc5cbd62a943a317c1b4575c5f3a92df40c042c97 (patch)
tree47db1af3c6ff2943edab349fbff251d2029052f0 /meta-arm
parent7363086d8a6f87f6c162a314937f1c2e3c063b42 (diff)
downloadopenbmc-nanbield.tar.xz
subtree updatesnanbield
meta-arm: 9a4ae38e84..150169d01f: Jon Mason (1): arm/linux-yocto: backport patch to fix 6.5.13 networking issues meta-raspberrypi: fde68b24f0..fd79e74cbc: Khem Raj (2): linux-raspberrypi_6.1.bb: Upgrade to 6.1.74 linux-raspberrypi: Upgrade to 6.1.77 Martin Jansa (1): u-boot: backport one commit from v2024.01 to fix booting from uSD poky: 1a5c00f00c..7b8aa378d0: Alex Kiernan (1): wireless-regdb: Upgrade 2023.09.01 -> 2024.01.23 Alexander Kanavin (3): linux-firmware: upgrade 20231211 -> 20240220 sdk-manual: correctly describe separate build-sysroots tasks in direct sdk workflows dev-manual: improve descriptions of 'bitbake -S printdiff' BELOUARGA Mohamed (1): ref-manual: add documentation of the variable SPDX_NAMESPACE_PREFIX Bruce Ashfield (2): linux-yocto/6.1: update to v6.1.78 linux-yocto/6.1: update CVE exclusions Claus Stovgaard (1): wpa-supplicant: Fix CVE-2023-52160 Dhairya Nagodra (2): glibc: Remove duplicate entry for CVE-2023-4527 xwayland: upgrade 23.2.3 -> 23.2.4 Geoff Parker (1): ref-manual: variables: adding multiple groups in GROUPADD_PARAM Johan Bezem (1): ref-manual: variables: correct sdk installation default path Khem Raj (1): core-image-ptest: Increase disk size to 1.5G for strace ptest image Lee Chee Yang (3): libxml2: upgrade to 2.11.7 openssl: upgrade to 3.1.5 migration-guides: add release notes for 4.0.17 Luca Ceresoli (2): ref-manual: tasks: do_cleanall: recommend using '-f' instead ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate Martin Jansa (1): contributor-guide: be more specific about meta-* trees Michael Halstead (1): yocto-uninative: Update to 4.4 for glibc 2.39 Michael Opdenacker (13): ref-manual: system-requirements: update packages to build docs ref-manual: release-process: grammar fix manuals: suppress excess use of "following" word dev-manual: packages: clarify shared PR service constraint dev-manual: packages: need enough free space dev-manual: packages: fix capitalization manuals: document VIRTUAL-RUNTIME variables manuals: add initial stylechecks with Vale profile-manual: usage.rst: formatting fixes manuals: use "manual page(s)" profile-manual: usage.rst: fix reference to bug report documentation: Makefile: remove releases.rst in "make clean" profile-manual: usage.rst: further style improvements Munehisa Kamata (1): kernel.bbclass: Set pkg-config variables for building modules Pavel Zhukov (1): mdadm: Disable ptests Priyal Doshi (1): tzdata : Upgrade to 2024a Ross Burton (4): curl: improve run-ptest curl: increase test timeouts openssl: fix crash on aarch64 if BTI is enabled but no Crypto instructions gstreamer1.0: skip a test that is known to be flaky Simone Weiß (4): dev-manual: Rephrase spdx creation gnutls: Upgrade 3.8.2 -> 3.8.3 contributor-guide: add notes for tests cve-check: Log if CVE_STATUS set but not reported for component Soumya Sambu (1): bind: Upgrade 9.18.21 -> 9.18.24 Steve Sakoman (3): poky.conf: bump version for 4.3.4 release build-appliance-image: Update to nanbield head revision build-appliance-image: Update to nanbield head revision Tim Orling (1): vim: upgrade v9.0.2130 -> v9.0.2190 Wang Mingyu (3): python3-jinja2: upgrade 3.1.2 -> 3.1.3 bind: upgrade 9.18.20 -> 9.18.21 gnutls: upgrade 3.8.1 -> 3.8.2 Yoann Congal (6): cve-update-nvd2-native: Fix typo in comment cve-update-nvd2-native: Add an age threshold for incremental update cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition cve-update-nvd2-native: nvd_request_next: Improve comment cve-update-nvd2-native: Fix CVE configuration update cve-update-nvd2-native: Remove rejected CVE from database Change-Id: I041c2504ee3a1b3275770a6949606db7f6e22ee0 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-arm')
-rw-r--r--meta-arm/meta-arm/recipes-kernel/linux/files/0001-neighbour-Fix-__randomize_layout-crash-in-struct-nei.patch46
-rw-r--r--meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend3
2 files changed, 49 insertions, 0 deletions
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/0001-neighbour-Fix-__randomize_layout-crash-in-struct-nei.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/0001-neighbour-Fix-__randomize_layout-crash-in-struct-nei.patch
new file mode 100644
index 0000000000..d622cbc6e4
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-kernel/linux/files/0001-neighbour-Fix-__randomize_layout-crash-in-struct-nei.patch
@@ -0,0 +1,46 @@
+From 45b3fae4675dc1d4ee2d7aefa19d85ee4f891377 Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
+Date: Sat, 25 Nov 2023 15:33:58 -0600
+Subject: [PATCH] neighbour: Fix __randomize_layout crash in struct neighbour
+
+Previously, one-element and zero-length arrays were treated as true
+flexible arrays, even though they are actually "fake" flex arrays.
+The __randomize_layout would leave them untouched at the end of the
+struct, similarly to proper C99 flex-array members.
+
+However, this approach changed with commit 1ee60356c2dc ("gcc-plugins:
+randstruct: Only warn about true flexible arrays"). Now, only C99
+flexible-array members will remain untouched at the end of the struct,
+while one-element and zero-length arrays will be subject to randomization.
+
+Fix a `__randomize_layout` crash in `struct neighbour` by transforming
+zero-length array `primary_key` into a proper C99 flexible-array member.
+
+Fixes: 1ee60356c2dc ("gcc-plugins: randstruct: Only warn about true flexible arrays")
+Closes: https://lore.kernel.org/linux-hardening/20231124102458.GB1503258@e124191.cambridge.arm.com/
+Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Tested-by: Joey Gouly <joey.gouly@arm.com>
+Link: https://lore.kernel.org/r/ZWJoRsJGnCPdJ3+2@work
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+
+Upstream-Status: Backport
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+
+---
+ include/net/neighbour.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/net/neighbour.h b/include/net/neighbour.h
+index 07022bb0d44d..0d28172193fa 100644
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -162,7 +162,7 @@ struct neighbour {
+ struct rcu_head rcu;
+ struct net_device *dev;
+ netdevice_tracker dev_tracker;
+- u8 primary_key[0];
++ u8 primary_key[];
+ } __randomize_layout;
+
+ struct neigh_ops {
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
index c4e351bb39..76b6f4cf40 100644
--- a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
@@ -1,5 +1,8 @@
ARMFILESPATHS := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " file://0001-neighbour-Fix-__randomize_layout-crash-in-struct-nei.patch"
+
COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
SRC_URI:append:generic-arm64 = " \