From: Steven Rostedt <rostedt@goodmis.org>
To: Yang Jihong <yangjihong1@huawei.com>
Cc: <mhiramat@kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line
Date: Sun, 20 Nov 2022 14:38:52 -0500 [thread overview]
Message-ID: <20221120143852.7e84b50d@rorschach.local.home> (raw)
In-Reply-To: <20221118102521.62362-1-yangjihong1@huawei.com>
On Fri, 18 Nov 2022 18:25:21 +0800
Yang Jihong <yangjihong1@huawei.com> wrote:
> 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.
>
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
> ---
>
> Changes since v1:
> - Print partial line to show the broken trace event when overflowed print_trace_line
>
> kernel/trace/trace.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 47a44b055a1d..81c36dc80212 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6786,7 +6786,32 @@ 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 trace_line of the tracer overflows seq_file
> + * buffer, trace_seq_to_user returns -EBUSY.
> + * In this case, we need to consume, otherwise,
> + * while loop will peek this event next time,
> + * resulting in an infinite loop.
> + */
> + if (trace_seq_has_overflowed(&iter->seq)) {
We need to only do this if save_len is zero. Because the reason that it
returns TRACE_TYPE_PARTIAL_LINE is usually because it overflowed.
This loops until the trace_seq is full, so it's OK to have it overflow.
The case I believe you are fixing, is the case were one
print_trace_line() actually fills the entire trace_seq in one shot. In
which case, it will never print, and in that case, save_len will be zero.
-- Steve
> + /*
> + * Print the partial line,
> + * that way we can see the broken trace event.
> + */
> + char dots[] = "...\n";
> +
> + iter->seq.full = 0;
> + if (seq_buf_buffer_left(&iter->seq.seq) < strlen(dots)) {
> + iter->seq.seq.len =
> + seq_buf_used(&iter->seq.seq) - strlen(dots);
> + }
> + trace_seq_puts(&iter->seq, dots);
> +
> + trace_consume(iter);
> + break;
> + }
> +
> + /* In other cases, don't print partial lines */
> iter->seq.seq.len = save_len;
> break;
> }
next prev parent reply other threads:[~2022-11-20 19:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 10:25 Yang Jihong
2022-11-20 19:38 ` Steven Rostedt [this message]
2022-11-21 8:19 ` Yang Jihong
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=20221120143852.7e84b50d@rorschach.local.home \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®