From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 12 Jun 2024 14:42:50 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v4.19.316~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd17e96bbd6c0e2ddd448ff473493dc4d95e2d0f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	scripts-gdb-fix-sb_-constants-parsing.patch
---

diff --git a/queue-6.1/scripts-gdb-fix-sb_-constants-parsing.patch b/queue-6.1/scripts-gdb-fix-sb_-constants-parsing.patch
new file mode 100644
index 00000000000..f97f9514855
--- /dev/null
+++ b/queue-6.1/scripts-gdb-fix-sb_-constants-parsing.patch
@@ -0,0 +1,63 @@
+From 6a59cb5158bff13b80f116305155fbe4967a5010 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+Date: Wed, 7 Jun 2023 15:13:35 -0700
+Subject: scripts/gdb: fix SB_* constants parsing
+
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+
+commit 6a59cb5158bff13b80f116305155fbe4967a5010 upstream.
+
+--0000000000009a0c9905fd9173ad
+Content-Transfer-Encoding: 8bit
+
+After f15afbd34d8f ("fs: fix undefined behavior in bit shift for
+SB_NOUSER") the constants were changed from plain integers which
+LX_VALUE() can parse to constants using the BIT() macro which causes the
+following:
+
+Reading symbols from build/linux-custom/vmlinux...done.
+Traceback (most recent call last):
+  File "/home/fainelli/work/buildroot/output/arm64/build/linux-custom/vmlinux-gdb.py", line 25, in <module>
+    import linux.constants
+  File "/home/fainelli/work/buildroot/output/arm64/build/linux-custom/scripts/gdb/linux/constants.py", line 5
+    LX_SB_RDONLY = ((((1UL))) << (0))
+
+Use LX_GDBPARSED() which does not suffer from that issue.
+
+f15afbd34d8f ("fs: fix undefined behavior in bit shift for SB_NOUSER")
+Link: https://lkml.kernel.org/r/20230607221337.2781730-1-florian.fainelli@broadcom.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Acked-by: Christian Brauner <brauner@kernel.org>
+Cc: Hao Ge <gehao@kylinos.cn>
+Cc: Jan Kiszka <jan.kiszka@siemens.com>
+Cc: Kieran Bingham <kbingham@kernel.org>
+Cc: Luis Chamberlain <mcgrof@kernel.org>
+Cc: Pankaj Raghav <p.raghav@samsung.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/gdb/linux/constants.py.in |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/scripts/gdb/linux/constants.py.in
++++ b/scripts/gdb/linux/constants.py.in
+@@ -46,12 +46,12 @@ if IS_BUILTIN(CONFIG_COMMON_CLK):
+     LX_GDBPARSED(CLK_GET_RATE_NOCACHE)
+ 
+ /* linux/fs.h */
+-LX_VALUE(SB_RDONLY)
+-LX_VALUE(SB_SYNCHRONOUS)
+-LX_VALUE(SB_MANDLOCK)
+-LX_VALUE(SB_DIRSYNC)
+-LX_VALUE(SB_NOATIME)
+-LX_VALUE(SB_NODIRATIME)
++LX_GDBPARSED(SB_RDONLY)
++LX_GDBPARSED(SB_SYNCHRONOUS)
++LX_GDBPARSED(SB_MANDLOCK)
++LX_GDBPARSED(SB_DIRSYNC)
++LX_GDBPARSED(SB_NOATIME)
++LX_GDBPARSED(SB_NODIRATIME)
+ 
+ /* linux/htimer.h */
+ LX_GDBPARSED(hrtimer_resolution)
diff --git a/queue-6.1/series b/queue-6.1/series
index 4840999d98c..fd661f82b56 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -12,3 +12,4 @@ mptcp-avoid-some-duplicate-code-in-socket-option-handling.patch
 mptcp-cleanup-sol_tcp-handling.patch
 mptcp-fix-full-tcp-keep-alive-support.patch
 vxlan-fix-regression-when-dropping-packets-due-to-invalid-src-addresses.patch
+scripts-gdb-fix-sb_-constants-parsing.patch