5.4-stable patches

added patches:
	gcov-add-support-for-gcc-15.patch
	strparser-fix-signed-unsigned-mismatch-bug.patch

diff --git a/queue-5.4/gcov-add-support-for-gcc-15.patch b/queue-5.4/gcov-add-support-for-gcc-15.patch
new file mode 100644 (file)
index 0000000..3c70c73
--- /dev/null
+++ b/queue-5.4/gcov-add-support-for-gcc-15.patch
@@ -0,0 +1,40 @@
+From ec4d11fc4b2dd4a2fa8c9d801ee9753b74623554 Mon Sep 17 00:00:00 2001
+From: Peter Oberparleiter <oberpar@linux.ibm.com>
+Date: Tue, 28 Oct 2025 12:51:25 +0100
+Subject: gcov: add support for GCC 15
+
+From: Peter Oberparleiter <oberpar@linux.ibm.com>
+
+commit ec4d11fc4b2dd4a2fa8c9d801ee9753b74623554 upstream.
+
+Using gcov on kernels compiled with GCC 15 results in truncated 16-byte
+long .gcda files with no usable data.  To fix this, update GCOV_COUNTERS
+to match the value defined by GCC 15.
+
+Tested with GCC 14.3.0 and GCC 15.2.0.
+
+Link: https://lkml.kernel.org/r/20251028115125.1319410-1-oberpar@linux.ibm.com
+Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com>
+Reported-by: Matthieu Baerts <matttbe@kernel.org>
+Closes: https://github.com/linux-test-project/lcov/issues/445
+Tested-by: Matthieu Baerts <matttbe@kernel.org>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/gcov/gcc_4_7.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/kernel/gcov/gcc_4_7.c
++++ b/kernel/gcov/gcc_4_7.c
+@@ -19,7 +19,9 @@
+ #include <linux/vmalloc.h>
+ #include "gcov.h"
+ 
+-#if (__GNUC__ >= 14)
++#if (__GNUC__ >= 15)
++#define GCOV_COUNTERS                 10
++#elif (__GNUC__ >= 14)
+ #define GCOV_COUNTERS                 9
+ #elif (__GNUC__ >= 10)
+ #define GCOV_COUNTERS                 8

diff --git a/queue-5.4/series b/queue-5.4/series
index d5a5f47928daa9d8a0e3131c2fb02501482d8d87..4a8d1cdcfc5fe143c9d34cbb601da1731bc8dbe4 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -149,3 +149,5 @@ asoc-cs4271-fix-regulator-leak-on-probe-failure.patch
 drm-vmwgfx-validate-command-header-size-against-svga.patch
 alsa-usb-audio-fix-null-pointer-dereference-in-snd_u.patch
 mm-ksm-fix-flag-dropping-behavior-in-ksm_madvise.patch
+gcov-add-support-for-gcc-15.patch
+strparser-fix-signed-unsigned-mismatch-bug.patch

diff --git a/queue-5.4/strparser-fix-signed-unsigned-mismatch-bug.patch b/queue-5.4/strparser-fix-signed-unsigned-mismatch-bug.patch
new file mode 100644 (file)
index 0000000..036a265
--- /dev/null
+++ b/queue-5.4/strparser-fix-signed-unsigned-mismatch-bug.patch
@@ -0,0 +1,47 @@
+From 4da4e4bde1c453ac5cc2dce5def81d504ae257ee Mon Sep 17 00:00:00 2001
+From: Nate Karstens <nate.karstens@garmin.com>
+Date: Thu, 6 Nov 2025 16:28:33 -0600
+Subject: strparser: Fix signed/unsigned mismatch bug
+
+From: Nate Karstens <nate.karstens@garmin.com>
+
+commit 4da4e4bde1c453ac5cc2dce5def81d504ae257ee upstream.
+
+The `len` member of the sk_buff is an unsigned int. This is cast to
+`ssize_t` (a signed type) for the first sk_buff in the comparison,
+but not the second sk_buff. On 32-bit systems, this can result in
+an integer underflow for certain values because unsigned arithmetic
+is being used.
+
+This appears to be an oversight: if the intention was to use unsigned
+arithmetic, then the first cast would have been omitted. The change
+ensures both len values are cast to `ssize_t`.
+
+The underflow causes an issue with ktls when multiple TLS PDUs are
+included in a single TCP segment. The mainline kernel does not use
+strparser for ktls anymore, but this is still useful for other
+features that still use strparser, and for backporting.
+
+Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
+Cc: stable@vger.kernel.org
+Fixes: 43a0c6751a32 ("strparser: Stream parser for messages")
+Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
+Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
+Link: https://patch.msgid.link/20251106222835.1871628-1-nate.karstens@garmin.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/strparser/strparser.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/strparser/strparser.c
++++ b/net/strparser/strparser.c
+@@ -238,7 +238,7 @@ static int __strp_recv(read_descriptor_t
+                               strp_parser_err(strp, -EMSGSIZE, desc);
+                               break;
+                       } else if (len <= (ssize_t)head->len -
+-                                        skb->len - stm->strp.offset) {
++                                        (ssize_t)skb->len - stm->strp.offset) {
+                               /* Length must be into new skb (and also
+                                * greater than zero)
+                                */