From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org, Yang Jihong <yangjihong1@huawei.com>
Subject: [for-next][PATCH 1/8] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line
Date: Wed, 14 Dec 2022 09:01:34 -0500 [thread overview]
Message-ID: <20221214140208.571914729@goodmis.org> (raw)
In-Reply-To: 20221214140133.608431204@goodmis.org
From: Yang Jihong <yangjihong1@huawei.com>
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>
---
kernel/trace/trace.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 664619b3f1e1..548890c7c0f5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6802,7 +6802,20 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
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;
}
--
2.35.1
next prev parent reply other threads:[~2022-12-14 14:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 14:01 [for-next][PATCH 0/8] tracing: Last minute fixes for 6.2 Steven Rostedt
2022-12-14 14:01 ` Steven Rostedt [this message]
2022-12-14 14:01 ` [for-next][PATCH 2/8] x86/mm/kmmio: Remove redundant preempt_disable() Steven Rostedt
2022-12-14 14:01 ` [for-next][PATCH 3/8] tracing: Have trigger filter parsing errors show up in error_log Steven Rostedt
2022-12-14 14:01 ` [for-next][PATCH 4/8] tracing: Remove pointer (asterisk) and brackets from cpumask_t field Steven Rostedt
2022-12-14 14:01 ` [for-next][PATCH 5/8] tracing: Do not synchronize freeing of trigger filter on boot up Steven Rostedt
2022-12-14 14:01 ` [for-next][PATCH 6/8] ftrace: Prevent RCU stall on PREEMPT_VOLUNTARY kernels Steven Rostedt
2022-12-14 15:53 ` Guilherme G. Piccoli
2022-12-14 16:15 ` Steven Rostedt
2022-12-14 16:17 ` Steven Rostedt
2022-12-14 16:23 ` Guilherme G. Piccoli
2022-12-14 14:01 ` [for-next][PATCH 7/8] tracing: Improve panic/die notifiers Steven Rostedt
2022-12-14 14:01 ` [for-next][PATCH 8/8] tracing: Fix cpumask() example typo Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221214140208.571914729@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yangjihong1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.