diff options
| author | Yang Jihong <yangjihong1@huawei.com> | 2022-11-29 19:30:09 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-07 12:07:36 +0100 |
| commit | 61d589b4023c34cf0909aad49f659f0c4bcf11aa (patch) | |
| tree | 663d4e248fa7392c2497fb536bec1e29852a8840 | |
| parent | 67a4e294c4cb1bbb3f836554ad614ce5aca109b4 (diff) | |
| download | linux-stable-61d589b4023c34cf0909aad49f659f0c4bcf11aa.tar.gz linux-stable-61d589b4023c34cf0909aad49f659f0c4bcf11aa.tar.bz2 linux-stable-61d589b4023c34cf0909aad49f659f0c4bcf11aa.zip | |
tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line
commit c1ac03af6ed45d05786c219d102f37eb44880f28 upstream.
print_trace_line may overflow seq_file buffer. If the event is not
consumed, the while loop keeps peeking this event, causing a infinite loop.
Link: https://lkml.kernel.org/r/20221129113009.182425-1-yangjihong1@huawei.com
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: stable@vger.kernel.org
Fixes: 088b1e427dbba ("ftrace: pipe fixes")
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/trace/trace.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index de1638df2b09..f614a5fee614 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5226,7 +5226,20 @@ waitagain: ret = print_trace_line(iter); if (ret == TRACE_TYPE_PARTIAL_LINE) { - /* don't print partial lines */ + /* + * If one print_trace_line() fills entire trace_seq in one shot, + * trace_seq_to_user() will returns -EBUSY because save_len == 0, + * In this case, we need to consume it, otherwise, loop will peek + * this event next time, resulting in an infinite loop. + */ + if (save_len == 0) { + iter->seq.full = 0; + trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n"); + trace_consume(iter); + break; + } + + /* In other cases, don't print partial lines */ iter->seq.seq.len = save_len; break; } |