Commit f8d7ab2b authored Sep 24, 2019 by Srikar Dronamraju Committed by Steven Rostedt (VMware) Sep 25, 2019

tracing/probe: Fix same probe event argument matching

Commit fe60b0ce ("tracing/probe: Reject exactly same probe event")
tries to reject a event which matches an already existing probe.

However it currently continues to match arguments and rejects adding a
probe even when the arguments don't match. Fix this by only rejecting a
probe if and only if all the arguments match.

Link: http://lkml.kernel.org/r/20190924114906.14038-1-srikar@linux.vnet.ibm.com

Fixes: fe60b0ce ("tracing/probe: Reject exactly same probe event")
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent b78b94b8

kernel/trace/trace_kprobe.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -549,9 +549,10 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig,
		for (i = 0; i < orig->tp.nr_args; i++) {
		if (strcmp(orig->tp.args[i].comm,
		comp->tp.args[i].comm))
		continue;
		break;
		}

		if (i == orig->tp.nr_args)
		return true;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -431,9 +431,10 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig,
		for (i = 0; i < orig->tp.nr_args; i++) {
		if (strcmp(orig->tp.args[i].comm,
		comp->tp.args[i].comm))
		continue;
		break;
		}

		if (i == orig->tp.nr_args)
		return true;
		}