tracing: Fix synthetic event to allow semicolon at end

mhiramat · rostedt · commit a360d9e4016c · 2018-10-19T17:25:11.000-04:00
Fix synthetic event to allow independent semicolon at end. The synthetic_events interface accepts a semicolon after the last word if there is no space. # echo "myevent u64 var;" >> synthetic_events But if there is a space, it returns an error. # echo "myevent u64 var ;" > synthetic_events sh: write error: Invalid argument This behavior is difficult for users to understand. Let's allow the last independent semicolon too. Link: http://lkml.kernel.org/r/153986835420.18251.2191216690677025744.stgit@devbox Cc: Shuah Khan <shuah@kernel.org> Cc: Tom Zanussi <tom.zanussi@linux.intel.com> Cc: stable@vger.kernel.org Fixes: commit 4b14793 ("tracing: Add support for 'synthetic' events") Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
@@ -1088,7 +1088,7 @@ static int create_synth_event(int argc, char **argv)
 		i += consumed - 1;
 	}
 
-	if (i < argc) {
+	if (i < argc && strcmp(argv[i], ";") != 0) {
 		ret = -EINVAL;
 		goto err;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,7 @@ static int create_synth_event(int argc, char **argv)`
`1088`	`1088`	`i += consumed - 1;`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`		`- if (i < argc) {`
	`1091`	`+ if (i < argc && strcmp(argv[i], ";") != 0) {`
`1092`	`1092`	`ret = -EINVAL;`
`1093`	`1093`	`goto err;`
`1094`	`1094`	`}`