From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 23 Aug 2022 07:01:29 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.9.326~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4477155b7ee43f9b749ca7080bee1e359e08e89;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	tracing-probes-have-kprobes-and-uprobes-use-comm-too.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 3ccc3076d91..caf0591cde6 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -150,3 +150,4 @@ video-fbdev-i740fb-check-the-argument-of-i740_calc_v.patch
 mips-tlbex-explicitly-compare-_page_no_exec-against-.patch
 netfilter-nftables-fix-a-warning-message-in-nf_tables_commit_audit_collect.patch
 netfilter-nf_tables-fix-audit-memory-leak-in-nf_tables_commit.patch
+tracing-probes-have-kprobes-and-uprobes-use-comm-too.patch
diff --git a/queue-5.10/tracing-probes-have-kprobes-and-uprobes-use-comm-too.patch b/queue-5.10/tracing-probes-have-kprobes-and-uprobes-use-comm-too.patch
new file mode 100644
index 00000000000..214d3bb05c4
--- /dev/null
+++ b/queue-5.10/tracing-probes-have-kprobes-and-uprobes-use-comm-too.patch
@@ -0,0 +1,53 @@
+From ab8384442ee512fc0fc72deeb036110843d0e7ff Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
+Date: Sat, 20 Aug 2022 09:43:21 -0400
+Subject: tracing/probes: Have kprobes and uprobes use $COMM too
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+commit ab8384442ee512fc0fc72deeb036110843d0e7ff upstream.
+
+Both $comm and $COMM can be used to get current->comm in eprobes and the
+filtering and histogram logic. Make kprobes and uprobes consistent in this
+regard and allow both $comm and $COMM as well. Currently kprobes and
+uprobes only handle $comm, which is inconsistent with the other utilities,
+and can be confusing to users.
+
+Link: https://lkml.kernel.org/r/20220820134401.317014913@goodmis.org
+Link: https://lore.kernel.org/all/20220820220442.776e1ddaf8836e82edb34d01@kernel.org/
+
+Cc: stable@vger.kernel.org
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
+Cc: Tom Zanussi <zanussi@kernel.org>
+Fixes: 533059281ee5 ("tracing: probeevent: Introduce new argument fetching code")
+Suggested-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/trace_probe.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/kernel/trace/trace_probe.c
++++ b/kernel/trace/trace_probe.c
+@@ -300,7 +300,7 @@ static int parse_probe_vars(char *arg, c
+ 			}
+ 		} else
+ 			goto inval_var;
+-	} else if (strcmp(arg, "comm") == 0) {
++	} else if (strcmp(arg, "comm") == 0 || strcmp(arg, "COMM") == 0) {
+ 		code->op = FETCH_OP_COMM;
+ #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
+ 	} else if (((flags & TPARG_FL_MASK) ==
+@@ -595,7 +595,8 @@ static int traceprobe_parse_probe_arg_bo
+ 	 * Since $comm and immediate string can not be dereferred,
+ 	 * we can find those by strcmp.
+ 	 */
+-	if (strcmp(arg, "$comm") == 0 || strncmp(arg, "\\\"", 2) == 0) {
++	if (strcmp(arg, "$comm") == 0 || strcmp(arg, "$COMM") == 0 ||
++	    strncmp(arg, "\\\"", 2) == 0) {
+ 		/* The type of $comm must be "string", and not an array. */
+ 		if (parg->count || (t && strcmp(t, "string")))
+ 			return -EINVAL;