Skip to content

Commit b27f266

Browse files
YWHyukrostedt
authored andcommitted
tracing: Fix return value of trace_pid_write()
Setting set_event_pid with trailing whitespace lead to endless write system calls like below. $ strace echo "123 " > /sys/kernel/debug/tracing/set_event_pid execve("/usr/bin/echo", ["echo", "123 "], ...) = 0 ... write(1, "123 \n", 5) = 4 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 .... This is because, the result of trace_get_user's are not returned when it read at least one pid. To fix it, update read variable even if parser->idx == 0. The result of applied patch is below. $ strace echo "123 " > /sys/kernel/debug/tracing/set_event_pid execve("/usr/bin/echo", ["echo", "123 "], ...) = 0 ... write(1, "123 \n", 5) = 5 close(1) = 0 Link: https://lkml.kernel.org/r/20220503050546.288911-1-vvghjk1234@gmail.com Cc: Ingo Molnar <mingo@redhat.com> Cc: Baik Song An <bsahn@etri.re.kr> Cc: Hong Yeon Kim <kimhy@etri.re.kr> Cc: Taeung Song <taeung@reallinux.co.kr> Cc: linuxgeek@linuxgeek.io Cc: stable@vger.kernel.org Fixes: 4909010 ("tracing: Add set_event_pid directory for future use") Signed-off-by: Wonhyuk Yang <vvghjk1234@gmail.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 99696a2 commit b27f266

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

kernel/trace/trace.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,13 +721,16 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,
721721
pos = 0;
722722

723723
ret = trace_get_user(&parser, ubuf, cnt, &pos);
724-
if (ret < 0 || !trace_parser_loaded(&parser))
724+
if (ret < 0)
725725
break;
726726

727727
read += ret;
728728
ubuf += ret;
729729
cnt -= ret;
730730

731+
if (!trace_parser_loaded(&parser))
732+
break;
733+
731734
ret = -EINVAL;
732735
if (kstrtoul(parser.buffer, 0, &val))
733736
break;
@@ -753,7 +756,6 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,
753756
if (!nr_pids) {
754757
/* Cleared the list of pids */
755758
trace_pid_list_free(pid_list);
756-
read = ret;
757759
pid_list = NULL;
758760
}
759761

0 commit comments

Comments
 (0)