[packages/kernel] up to 6.17.4
atler
atler at pld-linux.org
Mon Oct 20 21:46:40 CEST 2025
commit ebaf77a873f81507eaa4db45b660e8fe91c3f75b
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Oct 20 21:45:32 2025 +0200
up to 6.17.4
arm-scmi-init-quirks.patch | 82 ----------------------------------------------
kernel.spec | 6 ++--
2 files changed, 2 insertions(+), 86 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a64a487a..962f4d06 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -53,7 +53,7 @@
%define rel 1
%define basever 6.17
-%define postver .3
+%define postver .4
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -107,7 +107,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: ac8cfd661ca56a142bb92f9d9e7754a0
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 66830be3d3dddab8b04a5e79062461b1
+# Patch0-md5: 57d152fee7aab29215ea1afe2750a7d1
%endif
Source1: kernel.sysconfig
@@ -176,7 +176,6 @@ Patch7000: kernel-inittmpfs.patch
# ARM only
Patch8000: rpi-sound.patch
Patch8001: kernel-pinebook-pro.patch
-Patch8002: arm-scmi-init-quirks.patch
Patch8004: ath-regd.patch
Patch8005: rkvdec-hevc.patch
# Patch8005-md5: be31dd14250cc9e4eb496a5471e88d0f
@@ -583,7 +582,6 @@ cd linux-%{basever}
%ifarch %{arm} aarch64
%patch -P8000 -p1
%patch -P8001 -p1
-%patch -P8002 -p1
%patch -P8004 -p1
%patch -P8005 -p1
%endif
diff --git a/arm-scmi-init-quirks.patch b/arm-scmi-init-quirks.patch
deleted file mode 100644
index f5dc3cbd..00000000
--- a/arm-scmi-init-quirks.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 572ce546390d1b7c99b16c38cae1b680c716216c Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan at kernel.org>
-Date: Fri, 29 Aug 2025 15:21:52 +0200
-Subject: firmware: arm_scmi: quirk: Prevent writes to string constants
-
-The quirk version range is typically a string constant and must not be
-modified (e.g. as it may be stored in read-only memory). Attempting
-to do so can trigger faults such as:
-
- | Unable to handle kernel write to read-only memory at virtual
- | address ffffc036d998a947
-
-Update the range parsing so that it operates on a copy of the version
-range string, and mark all the quirk strings as const to reduce the
-risk of introducing similar future issues.
-
-Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220437
-Fixes: 487c407d57d6 ("firmware: arm_scmi: Add common framework to handle firmware quirks")
-Cc: stable at vger.kernel.org # 6.16
-Cc: Cristian Marussi <cristian.marussi at arm.com>
-Reported-by: Jan Palus <jpalus at fastmail.com>
-Signed-off-by: Johan Hovold <johan at kernel.org>
-Message-Id: <20250829132152.28218-1-johan at kernel.org>
-[sudeep.holla: minor commit message rewording; switch to cleanup helpers]
-Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
----
- drivers/firmware/arm_scmi/quirks.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-(limited to 'drivers/firmware/arm_scmi')
-
-diff --git a/drivers/firmware/arm_scmi/quirks.c b/drivers/firmware/arm_scmi/quirks.c
-index 03960aca361001..03848283c2a07b 100644
---- a/drivers/firmware/arm_scmi/quirks.c
-+++ b/drivers/firmware/arm_scmi/quirks.c
-@@ -71,6 +71,7 @@
- */
-
- #include <linux/ctype.h>
-+#include <linux/cleanup.h>
- #include <linux/device.h>
- #include <linux/export.h>
- #include <linux/hashtable.h>
-@@ -89,9 +90,9 @@
- struct scmi_quirk {
- bool enabled;
- const char *name;
-- char *vendor;
-- char *sub_vendor_id;
-- char *impl_ver_range;
-+ const char *vendor;
-+ const char *sub_vendor_id;
-+ const char *impl_ver_range;
- u32 start_range;
- u32 end_range;
- struct static_key_false *key;
-@@ -217,7 +218,7 @@ static unsigned int scmi_quirk_signature(const char *vend, const char *sub_vend)
-
- static int scmi_quirk_range_parse(struct scmi_quirk *quirk)
- {
-- const char *last, *first = quirk->impl_ver_range;
-+ const char *last, *first __free(kfree) = NULL;
- size_t len;
- char *sep;
- int ret;
-@@ -228,8 +229,12 @@ static int scmi_quirk_range_parse(struct scmi_quirk *quirk)
- if (!len)
- return 0;
-
-+ first = kmemdup(quirk->impl_ver_range, len + 1, GFP_KERNEL);
-+ if (!first)
-+ return -ENOMEM;
-+
- last = first + len - 1;
-- sep = strchr(quirk->impl_ver_range, '-');
-+ sep = strchr(first, '-');
- if (sep)
- *sep = '\0';
-
---
-cgit 1.2.3-korg
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/ebaf77a873f81507eaa4db45b660e8fe91c3f75b
More information about the pld-cvs-commit
mailing list