Commit 43ed3843 authored Nov 03, 2015 by Steven Rostedt (Red Hat) Committed by Steven Rostedt Nov 03, 2015

tracing: Put back comma for empty fields in boot string parsing

Both early_enable_events() and apply_trace_boot_options() parse a boot
string that may get parsed later on. They both use strsep() which converts a
comma into a nul character. To still allow the boot string to be parsed
again the same way, the nul character gets converted back to a comma after
the token is processed.

The problem is that these two functions check for an empty parameter (two
commas in a row ",,"), and continue the loop if the parameter is empty, but
fails to place the comma back. In this case, the second parsing will end at
this blank field, and not process fields afterward.

In most cases, users should not have an empty field, but if its going to be
checked, the code might as well be correct.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent a4d1e688

kernel/trace/trace.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -3636,9 +3636,8 @@ static void __init apply_trace_boot_options(void)

		if (!option)
		break;
		if (!*option)
		continue;

		if (*option)
		trace_set_options(&global_trace, option);

		/* Put back the comma to allow this to be called again */

kernel/trace/trace_events.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -3042,9 +3042,8 @@ early_enable_events(struct trace_array *tr, bool disable_first)

		if (!token)
		break;
		if (!*token)
		continue;

		if (*token) {
		/* Restarting syscalls requires that we stop them first */
		if (disable_first)
		ftrace_set_clr_event(tr, token, 0);
		@@ -3052,6 +3051,7 @@ early_enable_events(struct trace_array *tr, bool disable_first)
		ret = ftrace_set_clr_event(tr, token, 1);
		if (ret)
		pr_warn("Failed to enable trace event: %s\n", token);
		}

		/* Put back the comma to allow this to be called again */
		if (buf)

Admin message