6.6-stable patches

added patches:
	tracing-fix-have_dynamic_ftrace_with_regs-ifdef.patch
	tracing-inform-kmemleak-of-saved_cmdlines-allocation.patch

diff --git a/queue-6.6/series b/queue-6.6/series
index 2ede69c77622d6cc3847f245bf81f70449338167..936f89d95e7cab785633ed1be67eec33369038c4 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -247,3 +247,5 @@ can-j1939-prevent-deadlock-by-changing-j1939_socks_lock-to-rwlock.patch
 can-j1939-fix-uaf-in-j1939_sk_match_filter-during-setsockopt-so_j1939_filter.patch
 pmdomain-core-move-the-unused-cleanup-to-a-_sync-initcall.patch
 fs-proc-do_task_stat-move-thread_group_cputime_adjusted-outside-of-lock_task_sighand.patch
+tracing-fix-have_dynamic_ftrace_with_regs-ifdef.patch
+tracing-inform-kmemleak-of-saved_cmdlines-allocation.patch

diff --git a/queue-6.6/tracing-fix-have_dynamic_ftrace_with_regs-ifdef.patch b/queue-6.6/tracing-fix-have_dynamic_ftrace_with_regs-ifdef.patch
new file mode 100644 (file)
index 0000000..7ae77c9
--- /dev/null
+++ b/queue-6.6/tracing-fix-have_dynamic_ftrace_with_regs-ifdef.patch
@@ -0,0 +1,38 @@
+From bdbddb109c75365d22ec4826f480c5e75869e1cb Mon Sep 17 00:00:00 2001
+From: Petr Pavlu <petr.pavlu@suse.com>
+Date: Tue, 13 Feb 2024 14:24:34 +0100
+Subject: tracing: Fix HAVE_DYNAMIC_FTRACE_WITH_REGS ifdef
+
+From: Petr Pavlu <petr.pavlu@suse.com>
+
+commit bdbddb109c75365d22ec4826f480c5e75869e1cb upstream.
+
+Commit a8b9cf62ade1 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by
+default") attempted to fix an issue with direct trampolines on x86, see
+its description for details. However, it wrongly referenced the
+HAVE_DYNAMIC_FTRACE_WITH_REGS config option and the problem is still
+present.
+
+Add the missing "CONFIG_" prefix for the logic to work as intended.
+
+Link: https://lore.kernel.org/linux-trace-kernel/20240213132434.22537-1-petr.pavlu@suse.com
+
+Fixes: a8b9cf62ade1 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default")
+Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/ftrace.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -5331,7 +5331,7 @@ static int register_ftrace_function_nolo
+  * not support ftrace_regs_caller but direct_call, use SAVE_ARGS so that it
+  * jumps from ftrace_caller for multiple ftrace_ops.
+  */
+-#ifndef HAVE_DYNAMIC_FTRACE_WITH_REGS
++#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS
+ #define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_ARGS)
+ #else
+ #define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_REGS)

diff --git a/queue-6.6/tracing-inform-kmemleak-of-saved_cmdlines-allocation.patch b/queue-6.6/tracing-inform-kmemleak-of-saved_cmdlines-allocation.patch
new file mode 100644 (file)
index 0000000..6fd8982
--- /dev/null
+++ b/queue-6.6/tracing-inform-kmemleak-of-saved_cmdlines-allocation.patch
@@ -0,0 +1,94 @@
+From 2394ac4145ea91b92271e675a09af2a9ea6840b7 Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
+Date: Wed, 14 Feb 2024 11:20:46 -0500
+Subject: tracing: Inform kmemleak of saved_cmdlines allocation
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+commit 2394ac4145ea91b92271e675a09af2a9ea6840b7 upstream.
+
+The allocation of the struct saved_cmdlines_buffer structure changed from:
+
+        s = kmalloc(sizeof(*s), GFP_KERNEL);
+       s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL);
+
+to:
+
+       orig_size = sizeof(*s) + val * TASK_COMM_LEN;
+       order = get_order(orig_size);
+       size = 1 << (order + PAGE_SHIFT);
+       page = alloc_pages(GFP_KERNEL, order);
+       if (!page)
+               return NULL;
+
+       s = page_address(page);
+       memset(s, 0, sizeof(*s));
+
+       s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL);
+
+Where that s->saved_cmdlines allocation looks to be a dangling allocation
+to kmemleak. That's because kmemleak only keeps track of kmalloc()
+allocations. For allocations that use page_alloc() directly, the kmemleak
+needs to be explicitly informed about it.
+
+Add kmemleak_alloc() and kmemleak_free() around the page allocation so
+that it doesn't give the following false positive:
+
+unreferenced object 0xffff8881010c8000 (size 32760):
+  comm "swapper", pid 0, jiffies 4294667296
+  hex dump (first 32 bytes):
+    ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff  ................
+    ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff  ................
+  backtrace (crc ae6ec1b9):
+    [<ffffffff86722405>] kmemleak_alloc+0x45/0x80
+    [<ffffffff8414028d>] __kmalloc_large_node+0x10d/0x190
+    [<ffffffff84146ab1>] __kmalloc+0x3b1/0x4c0
+    [<ffffffff83ed7103>] allocate_cmdlines_buffer+0x113/0x230
+    [<ffffffff88649c34>] tracer_alloc_buffers.isra.0+0x124/0x460
+    [<ffffffff8864a174>] early_trace_init+0x14/0xa0
+    [<ffffffff885dd5ae>] start_kernel+0x12e/0x3c0
+    [<ffffffff885f5758>] x86_64_start_reservations+0x18/0x30
+    [<ffffffff885f582b>] x86_64_start_kernel+0x7b/0x80
+    [<ffffffff83a001c3>] secondary_startup_64_no_verify+0x15e/0x16b
+
+Link: https://lore.kernel.org/linux-trace-kernel/87r0hfnr9r.fsf@kernel.org/
+Link: https://lore.kernel.org/linux-trace-kernel/20240214112046.09a322d6@gandalf.local.home
+
+Cc: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+Cc: Catalin Marinas <catalin.marinas@arm.com>
+Fixes: 44dc5c41b5b1 ("tracing: Fix wasted memory in saved_cmdlines logic")
+Reported-by: Kalle Valo <kvalo@kernel.org>
+Tested-by: Kalle Valo <kvalo@kernel.org>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/trace.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -39,6 +39,7 @@
+ #include <linux/ctype.h>
+ #include <linux/init.h>
+ #include <linux/panic_notifier.h>
++#include <linux/kmemleak.h>
+ #include <linux/poll.h>
+ #include <linux/nmi.h>
+ #include <linux/fs.h>
+@@ -2330,6 +2331,7 @@ static void free_saved_cmdlines_buffer(s
+       int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN);
+ 
+       kfree(s->map_cmdline_to_pid);
++      kmemleak_free(s);
+       free_pages((unsigned long)s, order);
+ }
+ 
+@@ -2349,6 +2351,7 @@ static struct saved_cmdlines_buffer *all
+               return NULL;
+ 
+       s = page_address(page);
++      kmemleak_alloc(s, size, 1, GFP_KERNEL);
+       memset(s, 0, sizeof(*s));
+ 
+       /* Round up to actual allocation */