From: Greg Kroah-Hartman Date: Mon, 7 Oct 2024 10:29:41 +0000 (+0200) Subject: drop proc "fix" that broke the build X-Git-Tag: v6.6.55~95 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f235e4fe2b14d14cd39e80ae1a583f0420defd5b;p=thirdparty%2Fkernel%2Fstable-queue.git drop proc "fix" that broke the build --- diff --git a/queue-5.10/genirq-proc-correctly-set-file-permissions-for-affin.patch b/queue-5.10/genirq-proc-correctly-set-file-permissions-for-affin.patch deleted file mode 100644 index 1879d2f8c08..00000000000 --- a/queue-5.10/genirq-proc-correctly-set-file-permissions-for-affin.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 29dcdb5f2131a9f4f4026a6216d62c81f053ecdf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 25 Aug 2024 21:19:11 +0800 -Subject: genirq/proc: Correctly set file permissions for affinity control - files - -From: Jeff Xie - -[ Upstream commit c7718e5c76d49b5bb394265383ae51f766d5dd3a ] - -The kernel already knows at the time of interrupt allocation whether -affinity of an interrupt can be controlled by userspace or not. - -It still creates all related procfs control files with read/write -permissions. That's inconsistent and non-intuitive for system -administrators and tools. - -Therefore set the file permissions to read-only for such interrupts. - -[ tglx: Massage change log, fixed UP build ] - -Signed-off-by: Jeff Xie -Signed-off-by: Thomas Gleixner -Link: https://lore.kernel.org/all/20240825131911.107119-1-jeff.xie@linux.dev -Signed-off-by: Sasha Levin ---- - kernel/irq/proc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c -index 72513ed2a5fc6..788f4462b7797 100644 ---- a/kernel/irq/proc.c -+++ b/kernel/irq/proc.c -@@ -362,8 +362,13 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) - goto out_unlock; - - #ifdef CONFIG_SMP -+ umode_t umode = S_IRUGO; -+ -+ if (irq_can_set_affinity_usr(desc->irq_data.irq)) -+ umode |= S_IWUSR; -+ - /* create /proc/irq//smp_affinity */ -- proc_create_data("smp_affinity", 0644, desc->dir, -+ proc_create_data("smp_affinity", umode, desc->dir, - &irq_affinity_proc_ops, irqp); - - /* create /proc/irq//affinity_hint */ -@@ -371,7 +376,7 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) - irq_affinity_hint_proc_show, irqp); - - /* create /proc/irq//smp_affinity_list */ -- proc_create_data("smp_affinity_list", 0644, desc->dir, -+ proc_create_data("smp_affinity_list", umode, desc->dir, - &irq_affinity_list_proc_ops, irqp); - - proc_create_single_data("node", 0444, desc->dir, irq_node_proc_show, --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index c9324687a85..1e644aa75c4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -327,7 +327,6 @@ wifi-mwifiex-fix-memcpy-field-spanning-write-warning.patch nfp-use-irqf_no_autoen-flag-in-request_irq.patch signal-replace-bug_on-s.patch regmap-hold-the-regmap-lock-when-allocating-and-free.patch -genirq-proc-correctly-set-file-permissions-for-affin.patch alsa-usb-audio-define-macros-for-quirk-table-entries.patch alsa-usb-audio-add-logitech-audio-profile-quirk.patch alsa-asihpi-fix-potential-oob-array-access.patch diff --git a/queue-5.15/genirq-proc-correctly-set-file-permissions-for-affin.patch b/queue-5.15/genirq-proc-correctly-set-file-permissions-for-affin.patch deleted file mode 100644 index 56085b14a51..00000000000 --- a/queue-5.15/genirq-proc-correctly-set-file-permissions-for-affin.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 94333b60d5d3d5d505da92fdcd965ef4b8e101ed Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 25 Aug 2024 21:19:11 +0800 -Subject: genirq/proc: Correctly set file permissions for affinity control - files - -From: Jeff Xie - -[ Upstream commit c7718e5c76d49b5bb394265383ae51f766d5dd3a ] - -The kernel already knows at the time of interrupt allocation whether -affinity of an interrupt can be controlled by userspace or not. - -It still creates all related procfs control files with read/write -permissions. That's inconsistent and non-intuitive for system -administrators and tools. - -Therefore set the file permissions to read-only for such interrupts. - -[ tglx: Massage change log, fixed UP build ] - -Signed-off-by: Jeff Xie -Signed-off-by: Thomas Gleixner -Link: https://lore.kernel.org/all/20240825131911.107119-1-jeff.xie@linux.dev -Signed-off-by: Sasha Levin ---- - kernel/irq/proc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c -index ee595ec09778d..b2893416c9df0 100644 ---- a/kernel/irq/proc.c -+++ b/kernel/irq/proc.c -@@ -362,8 +362,13 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) - goto out_unlock; - - #ifdef CONFIG_SMP -+ umode_t umode = S_IRUGO; -+ -+ if (irq_can_set_affinity_usr(desc->irq_data.irq)) -+ umode |= S_IWUSR; -+ - /* create /proc/irq//smp_affinity */ -- proc_create_data("smp_affinity", 0644, desc->dir, -+ proc_create_data("smp_affinity", umode, desc->dir, - &irq_affinity_proc_ops, irqp); - - /* create /proc/irq//affinity_hint */ -@@ -371,7 +376,7 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) - irq_affinity_hint_proc_show, irqp); - - /* create /proc/irq//smp_affinity_list */ -- proc_create_data("smp_affinity_list", 0644, desc->dir, -+ proc_create_data("smp_affinity_list", umode, desc->dir, - &irq_affinity_list_proc_ops, irqp); - - proc_create_single_data("node", 0444, desc->dir, irq_node_proc_show, --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 6f95b079515..0c334df23ec 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -420,7 +420,6 @@ wifi-mwifiex-fix-memcpy-field-spanning-write-warning.patch nfp-use-irqf_no_autoen-flag-in-request_irq.patch signal-replace-bug_on-s.patch regmap-hold-the-regmap-lock-when-allocating-and-free.patch -genirq-proc-correctly-set-file-permissions-for-affin.patch alsa-usb-audio-add-input-value-sanity-checks-for-sta.patch x86-ioapic-handle-allocation-failures-gracefully.patch alsa-usb-audio-define-macros-for-quirk-table-entries.patch