From: Steven Rostedt <rostedt@goodmis.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] tracing: off by one in __trace_array_vprintk()
Date: Wed, 26 Nov 2014 09:25:37 -0500 [thread overview]
Message-ID: <20141126092537.14b6ea9f@gandalf.local.home> (raw)
In-Reply-To: <20141126140621.GA18740@mwanda>
On Wed, 26 Nov 2014 17:06:21 +0300
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> This check says "goto out;" if we had to truncate the string.
>
> The "tbuffer" buffer has TRACE_BUF_SIZE bytes. The vsnprintf() function
> returns the number of characters (not counting the NUL char) which would
> have been printed if there were space. If we we tried to print
> TRACE_BUF_SIZE characters, the last character would have been truncated
> to make space for the NUL character so we should "goto out;".
>
> My other concern here was that a few lines later we do:
>
> entry->buf[len] = '\0';
>
> I worried that maybe we were putting the NUL char past the end of the
> array but I wasn't smart enough to figure out the size of entry->buf[].
entry is of type struct print_entry *, which is defined by macro magic
(sorry), and would look like this:
struct print_entry {
unsigned long ip;
char buf[];
};
But then it is allocated like so:
size = sizeof(*entry) + len + 1;
event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,
flags, pc);
entry = ring_buffer_event_data(event);
Now that size is the key. The "len + 1" covers the string. Which means
entry->buf[len] = '\0';
is fine.
-- Steve
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 42a822d..22af2ae 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -2161,7 +2161,7 @@ __trace_array_vprintk(struct ring_buffer *buffer,
> }
>
> len = vsnprintf(tbuffer, TRACE_BUF_SIZE, fmt, args);
> - if (len > TRACE_BUF_SIZE)
> + if (len >= TRACE_BUF_SIZE)
> goto out;
>
> local_save_flags(flags);
next prev parent reply other threads:[~2014-11-26 14:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 14:06 Dan Carpenter
2014-11-26 14:25 ` Steven Rostedt [this message]
2014-11-26 14:34 ` Dan Carpenter
2014-11-26 14:27 ` Steven Rostedt
2014-11-26 14:37 ` Dan Carpenter
2014-11-26 14:43 ` Steven Rostedt
2014-11-26 15:05 ` Dan Carpenter
2014-11-26 15:22 ` Steven Rostedt
2014-11-26 15:46 ` Dan Carpenter
2014-11-27 15:57 ` [patch v2] tracing: truncated output is better than nothing Dan Carpenter
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=20141126092537.14b6ea9f@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.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®