Skip to content

Commit f4d0706

Browse files
Changbin Durostedt
authored andcommitted
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/[email protected] Acked-by: Namhyung Kim <[email protected]> Signed-off-by: Changbin Du <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 76638d9 commit f4d0706

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

kernel/trace/ftrace.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5015,7 +5015,6 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
50155015

50165016
parser = &iter->parser;
50175017
if (trace_parser_loaded(parser)) {
5018-
parser->buffer[parser->idx] = 0;
50195018
ftrace_match_records(iter->hash, parser->buffer, parser->idx);
50205019
}
50215020

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

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

kernel/trace/trace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,6 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,
530530
ubuf += ret;
531531
cnt -= ret;
532532

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

kernel/trace/trace_events.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,8 +885,6 @@ ftrace_event_write(struct file *file, const char __user *ubuf,
885885
if (*parser.buffer == '!')
886886
set = 0;
887887

888-
parser.buffer[parser.idx] = 0;
889-
890888
ret = ftrace_set_clr_event(tr, parser.buffer + !set, set);
891889
if (ret)
892890
goto out_put;

0 commit comments

Comments
 (0)