From: Steven Rostedt <rostedt@goodmis.org>
To: Yang Jihong <yangjihong1@huawei.com>
Cc: <mhiramat@kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line
Date: Mon, 28 Nov 2022 11:46:13 -0500 [thread overview]
Message-ID: <20221128114613.1c664e81@gandalf.local.home> (raw)
In-Reply-To: <20221124125850.155449-1-yangjihong1@huawei.com>
On Thu, 24 Nov 2022 20:58:50 +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>
> ---
> kernel/trace/trace.c | 22 +++++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index a7fe0e115272..55733224fa88 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6787,7 +6787,27 @@ 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 it, otherwise,
> + * while loop will peek this event next time,
> + * resulting in an infinite loop.
> + */
> + if (trace_seq_has_overflowed(&iter->seq)) {
The only way to get here is if the above is true, and that is not going to
cause the infinite loop. What does is if save_len == 0. In fact, that's
all you need to check for:
if (save_len == 0) {
Should do the trick.
-- Steve
> + /*
> + * Here we only consider the case that one
> + * print_trace_line() fills the entire trace_seq
> + * in one shot, in that case, iter->seq.seq.len is zero,
> + * we simply output a log of too long line to inform the user.
> + */
> + 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;
> }
next prev parent reply other threads:[~2022-11-28 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 12:58 [PATCH v3] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line Yang Jihong
2022-11-28 16:46 ` Steven Rostedt [this message]
2022-11-29 11:31 ` 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=20221128114613.1c664e81@gandalf.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;
as well as URLs for NNTP newsgroup(s).