5.15-stable patches

added patches:
	nubus-partially-revert-proc_create_single_data-conversion.patch
	parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch

diff --git a/queue-5.15/nubus-partially-revert-proc_create_single_data-conversion.patch b/queue-5.15/nubus-partially-revert-proc_create_single_data-conversion.patch
new file mode 100644 (file)
index 0000000..2f39db4
--- /dev/null
+++ b/queue-5.15/nubus-partially-revert-proc_create_single_data-conversion.patch
@@ -0,0 +1,117 @@
+From 0e96647cff9224db564a1cee6efccb13dbe11ee2 Mon Sep 17 00:00:00 2001
+From: Finn Thain <fthain@linux-m68k.org>
+Date: Tue, 14 Mar 2023 19:51:59 +1100
+Subject: nubus: Partially revert proc_create_single_data() conversion
+
+From: Finn Thain <fthain@linux-m68k.org>
+
+commit 0e96647cff9224db564a1cee6efccb13dbe11ee2 upstream.
+
+The conversion to proc_create_single_data() introduced a regression
+whereby reading a file in /proc/bus/nubus results in a seg fault:
+
+    # grep -r . /proc/bus/nubus/e/
+    Data read fault at 0x00000020 in Super Data (pc=0x1074c2)
+    BAD KERNEL BUSERR
+    Oops: 00000000
+    Modules linked in:
+    PC: [<001074c2>] PDE_DATA+0xc/0x16
+    SR: 2010  SP: 38284958  a2: 01152370
+    d0: 00000001    d1: 01013000    d2: 01002790    d3: 00000000
+    d4: 00000001    d5: 0008ce2e    a0: 00000000    a1: 00222a40
+    Process grep (pid: 45, task=142f8727)
+    Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70
+    baddr=001074c8 dibuf=ffffffff ver=f
+    Stack from 01199e48:
+           01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000
+           00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000
+           d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000
+           00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640
+           011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c
+           000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0
+    Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0
+     [<000d551a>] seq_read+0xc4/0x510
+     [<00018000>] fp_fcos+0x2/0x82
+     [<0002800d>] __sys_setreuid+0x115/0x1c6
+     [<00103640>] proc_reg_read+0x5c/0xb0
+     [<00018000>] fp_fcos+0x2/0x82
+     [<000b3344>] __vfs_read+0x2c/0x13c
+     [<00018000>] fp_fcos+0x2/0x82
+     [<00018000>] fp_fcos+0x2/0x82
+     [<000b8aa2>] sys_statx+0x60/0x7e
+     [<000b34b6>] vfs_read+0x62/0x12a
+     [<00018000>] fp_fcos+0x2/0x82
+     [<00018000>] fp_fcos+0x2/0x82
+     [<000b39c2>] ksys_read+0x48/0xbe
+     [<00018000>] fp_fcos+0x2/0x82
+     [<000b3a4e>] sys_read+0x16/0x1a
+     [<00018000>] fp_fcos+0x2/0x82
+     [<00002b84>] syscall+0x8/0xc
+     [<00018000>] fp_fcos+0x2/0x82
+     [<0000c016>] not_ext+0xa/0x18
+    Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8
+    Disabling lock debugging due to kernel taint
+
+    Segmentation fault
+
+The proc_create_single_data() conversion does not work because
+single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not
+equivalent to the original code.
+
+Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}")
+Cc: Christoph Hellwig <hch@lst.de>
+Cc: stable@vger.kernel.org # 5.6+
+Signed-off-by: Finn Thain <fthain@linux-m68k.org>
+Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Link: https://lore.kernel.org/r/d4e2a586e793cc8d9442595684ab8a077c0fe726.1678783919.git.fthain@linux-m68k.org
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nubus/proc.c |   22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+--- a/drivers/nubus/proc.c
++++ b/drivers/nubus/proc.c
+@@ -137,6 +137,18 @@ static int nubus_proc_rsrc_show(struct s
+       return 0;
+ }
+ 
++static int nubus_rsrc_proc_open(struct inode *inode, struct file *file)
++{
++      return single_open(file, nubus_proc_rsrc_show, inode);
++}
++
++static const struct proc_ops nubus_rsrc_proc_ops = {
++      .proc_open      = nubus_rsrc_proc_open,
++      .proc_read      = seq_read,
++      .proc_lseek     = seq_lseek,
++      .proc_release   = single_release,
++};
++
+ void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
+                            const struct nubus_dirent *ent,
+                            unsigned int size)
+@@ -152,8 +164,8 @@ void nubus_proc_add_rsrc_mem(struct proc
+               pde_data = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
+       else
+               pde_data = NULL;
+-      proc_create_single_data(name, S_IFREG | 0444, procdir,
+-                      nubus_proc_rsrc_show, pde_data);
++      proc_create_data(name, S_IFREG | 0444, procdir,
++                       &nubus_rsrc_proc_ops, pde_data);
+ }
+ 
+ void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
+@@ -166,9 +178,9 @@ void nubus_proc_add_rsrc(struct proc_dir
+               return;
+ 
+       snprintf(name, sizeof(name), "%x", ent->type);
+-      proc_create_single_data(name, S_IFREG | 0444, procdir,
+-                      nubus_proc_rsrc_show,
+-                      nubus_proc_alloc_pde_data(data, 0));
++      proc_create_data(name, S_IFREG | 0444, procdir,
++                       &nubus_rsrc_proc_ops,
++                       nubus_proc_alloc_pde_data(data, 0));
+ }
+ 
+ /*

diff --git a/queue-5.15/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch b/queue-5.15/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch
new file mode 100644 (file)
index 0000000..b1e2fab
--- /dev/null
+++ b/queue-5.15/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch
@@ -0,0 +1,42 @@
+From b5b2a02bcaac7c287694aa0db4837a07bf178626 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <benh@debian.org>
+Date: Thu, 15 Jun 2023 00:00:02 +0200
+Subject: parisc: Delete redundant register definitions in <asm/assembly.h>
+
+From: Ben Hutchings <benh@debian.org>
+
+commit b5b2a02bcaac7c287694aa0db4837a07bf178626 upstream.
+
+We define sp and ipsw in <asm/asmregs.h> using ".reg", and when using
+current binutils (snapshot 2.40.50.20230611) the definitions in
+<asm/assembly.h> using "=" conflict with those:
+
+arch/parisc/include/asm/assembly.h: Assembler messages:
+arch/parisc/include/asm/assembly.h:93: Error: symbol `sp' is already defined
+arch/parisc/include/asm/assembly.h:95: Error: symbol `ipsw' is already defined
+
+Delete the duplicate definitions in <asm/assembly.h>.
+
+Also delete the definition of gp, which isn't used anywhere.
+
+Signed-off-by: Ben Hutchings <benh@debian.org>
+Cc: stable@vger.kernel.org # v6.0+
+Signed-off-by: Helge Deller <deller@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/parisc/include/asm/assembly.h |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/arch/parisc/include/asm/assembly.h
++++ b/arch/parisc/include/asm/assembly.h
+@@ -72,10 +72,6 @@
+ 
+ #include <asm/asmregs.h>
+ 
+-      sp      =       30
+-      gp      =       27
+-      ipsw    =       22
+-
+       /*
+        * We provide two versions of each macro to convert from physical
+        * to virtual and vice versa. The "_r1" versions take one argument

diff --git a/queue-5.15/series b/queue-5.15/series
index 1cc225e2f409ddddd011d04ac5ec352f9514f4f6..bb51301fdce46d6bec4721e1afb9cd964e93503c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -13,3 +13,5 @@ revert-thermal-drivers-mediatek-use-devm_of_iomap-to-avoid-resource-leak-in-mtk_
 perf-symbols-symbol-lookup-with-kcore-can-fail-if-multiple-segments-match-stext.patch
 scripts-tags.sh-resolve-gtags-empty-index-generation.patch
 drm-amdgpu-validate-vm-ioctl-flags.patch
+parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch
+nubus-partially-revert-proc_create_single_data-conversion.patch