Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d0706c authored Jan 16, 2018 by Changbin Du Committed by Steven Rostedt (VMware) Jan 23, 2018

tracing: Make sure the parsed string always terminates with '\0'

Always mark the parsed string with a terminated nul '\0' character. This removes
the need for the users to have to append the '\0' before using the parsed string.

Link: http://lkml.kernel.org/r/1516093350-12045-4-git-send-email-changbin.du@intel.com

Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Changbin Du <changbin.du@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent 76638d96

kernel/trace/ftrace.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5015,7 +5015,6 @@ int ftrace_regex_release(struct inode inode, struct file file)

	parser = &iter->parser;		parser = &iter->parser;
	if (trace_parser_loaded(parser)) {		if (trace_parser_loaded(parser)) {
	parser->buffer[parser->idx] = 0;
	ftrace_match_records(iter->hash, parser->buffer, parser->idx);		ftrace_match_records(iter->hash, parser->buffer, parser->idx);
	}		}

	@@ -5329,7 +5328,6 @@ ftrace_graph_release(struct inode inode, struct file file)
	parser = &fgd->parser;		parser = &fgd->parser;

	if (trace_parser_loaded((parser))) {		if (trace_parser_loaded((parser))) {
	parser->buffer[parser->idx] = 0;
	ret = ftrace_graph_set_hash(fgd->new_hash,		ret = ftrace_graph_set_hash(fgd->new_hash,
	parser->buffer);		parser->buffer);
	}		}

kernel/trace/trace.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -530,8 +530,6 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,
	ubuf += ret;		ubuf += ret;
	cnt -= ret;		cnt -= ret;

	parser.buffer[parser.idx] = 0;

	ret = -EINVAL;		ret = -EINVAL;
	if (kstrtoul(parser.buffer, 0, &val))		if (kstrtoul(parser.buffer, 0, &val))
	break;		break;
	@@ -1268,6 +1266,8 @@ int trace_get_user(struct trace_parser parser, const char __user ubuf,
	} else if (parser->idx < parser->size - 1) {		} else if (parser->idx < parser->size - 1) {
	parser->cont = true;		parser->cont = true;
	parser->buffer[parser->idx++] = ch;		parser->buffer[parser->idx++] = ch;
			/* Make sure the parsed string always terminates with '\0'. */
			parser->buffer[parser->idx] = 0;
	} else {		} else {
	ret = -EINVAL;		ret = -EINVAL;
	goto out;		goto out;

kernel/trace/trace_events.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -885,8 +885,6 @@ ftrace_event_write(struct file file, const char __user ubuf,
	if (*parser.buffer == '!')		if (*parser.buffer == '!')
	set = 0;		set = 0;

	parser.buffer[parser.idx] = 0;

	ret = ftrace_set_clr_event(tr, parser.buffer + !set, set);		ret = ftrace_set_clr_event(tr, parser.buffer + !set, set);
	if (ret)		if (ret)
	goto out_put;		goto out_put;