From: Greg Kroah-Hartman Date: Tue, 11 Apr 2023 12:11:52 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.15.107~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2d647e79c11d5b45cf670180f4f1abbb46ee2d8;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: tracing-synthetic-make-lastcmd_mutex-static.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 7a46d097b31..aaf5b0b489e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -125,3 +125,4 @@ tracing-timerlat-notify-new-max-thread-latency.patch tracing-osnoise-fix-notify-new-tracing_max_latency.patch tracing-free-error-logs-of-tracing-instances.patch asoc-hdac_hdmi-use-set_stream-instead-of-set_tdm_slots.patch +tracing-synthetic-make-lastcmd_mutex-static.patch diff --git a/queue-6.1/tracing-synthetic-make-lastcmd_mutex-static.patch b/queue-6.1/tracing-synthetic-make-lastcmd_mutex-static.patch new file mode 100644 index 00000000000..5a585ba75cd --- /dev/null +++ b/queue-6.1/tracing-synthetic-make-lastcmd_mutex-static.patch @@ -0,0 +1,38 @@ +From 31c683967174b487939efaf65e41f5ff1404e141 Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Google)" +Date: Thu, 6 Apr 2023 11:10:33 -0400 +Subject: tracing/synthetic: Make lastcmd_mutex static + +From: Steven Rostedt (Google) + +commit 31c683967174b487939efaf65e41f5ff1404e141 upstream. + +The lastcmd_mutex is only used in trace_events_synth.c and should be +static. + +Link: https://lore.kernel.org/linux-trace-kernel/202304062033.cRStgOuP-lkp@intel.com/ +Link: https://lore.kernel.org/linux-trace-kernel/20230406111033.6e26de93@gandalf.local.home + +Cc: Masami Hiramatsu +Cc: Mark Rutland +Cc: Tze-nan Wu +Fixes: 4ccf11c4e8a8e ("tracing/synthetic: Fix races on freeing last_cmd") +Reviewed-by: Mukesh Ojha +Reported-by: kernel test robot +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + kernel/trace/trace_events_synth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/trace/trace_events_synth.c ++++ b/kernel/trace/trace_events_synth.c +@@ -44,7 +44,7 @@ enum { ERRORS }; + + static const char *err_text[] = { ERRORS }; + +-DEFINE_MUTEX(lastcmd_mutex); ++static DEFINE_MUTEX(lastcmd_mutex); + static char *last_cmd; + + static int errpos(const char *str)