From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 4 Jun 2025 13:15:42 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v6.12.33~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ed73414fedfeee6c784fe8c2accc56a18fb6573;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	series
	tracing-fix-compilation-warning-on-arm32.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644
index 0000000000..6502ba340f
--- /dev/null
+++ b/queue-5.10/series
@@ -0,0 +1 @@
+tracing-fix-compilation-warning-on-arm32.patch
diff --git a/queue-5.10/tracing-fix-compilation-warning-on-arm32.patch b/queue-5.10/tracing-fix-compilation-warning-on-arm32.patch
new file mode 100644
index 0000000000..68e2d58546
--- /dev/null
+++ b/queue-5.10/tracing-fix-compilation-warning-on-arm32.patch
@@ -0,0 +1,52 @@
+From 2fbdb6d8e03b70668c0876e635506540ae92ab05 Mon Sep 17 00:00:00 2001
+From: Pan Taixi <pantaixi@huaweicloud.com>
+Date: Mon, 26 May 2025 09:37:31 +0800
+Subject: tracing: Fix compilation warning on arm32
+
+From: Pan Taixi <pantaixi@huaweicloud.com>
+
+commit 2fbdb6d8e03b70668c0876e635506540ae92ab05 upstream.
+
+On arm32, size_t is defined to be unsigned int, while PAGE_SIZE is
+unsigned long. This hence triggers a compilation warning as min()
+asserts the type of two operands to be equal. Casting PAGE_SIZE to size_t
+solves this issue and works on other target architectures as well.
+
+Compilation warning details:
+
+kernel/trace/trace.c: In function 'tracing_splice_read_pipe':
+./include/linux/minmax.h:20:28: warning: comparison of distinct pointer types lacks a cast
+  (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
+                            ^
+./include/linux/minmax.h:26:4: note: in expansion of macro '__typecheck'
+   (__typecheck(x, y) && __no_side_effects(x, y))
+    ^~~~~~~~~~~
+
+...
+
+kernel/trace/trace.c:6771:8: note: in expansion of macro 'min'
+        min((size_t)trace_seq_used(&iter->seq),
+        ^~~
+
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/20250526013731.1198030-1-pantaixi@huaweicloud.com
+Fixes: f5178c41bb43 ("tracing: Fix oob write in trace_seq_to_buffer()")
+Reviewed-by: Jeongjun Park <aha310510@gmail.com>
+Signed-off-by: Pan Taixi <pantaixi@huaweicloud.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/trace.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -6686,7 +6686,7 @@ static ssize_t tracing_splice_read_pipe(
+ 		ret = trace_seq_to_buffer(&iter->seq,
+ 					  page_address(spd.pages[i]),
+ 					  min((size_t)trace_seq_used(&iter->seq),
+-						  PAGE_SIZE));
++						  (size_t)PAGE_SIZE));
+ 		if (ret < 0) {
+ 			__free_page(spd.pages[i]);
+ 			break;