tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line
authorYang Jihong <yangjihong1@huawei.com>
Tue, 29 Nov 2022 11:30:09 +0000 (19:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:07:36 +0000 (12:07 +0100)
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>
kernel/trace/trace.c

index de1638df2b095f375f696acf84a3fe6e78a45ed9..f614a5fee61422255f63f229707a1f3aab4a61cc 100644 (file)
@@ -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;
                }