From: Dan Carpenter <dan.carpenter@oracle.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] tracing: Fix an off by one in __next()
Date: Tue, 27 Nov 2018 23:04:08 +0300 [thread overview]
Message-ID: <20181127200408.GG3073@unbuntlaptop> (raw)
In-Reply-To: <20181127134412.6f2141d4@gandalf.local.home>
On Tue, Nov 27, 2018 at 01:44:12PM -0500, Steven Rostedt wrote:
>
> Doing the sweep of my INBOX, I came across this patch (it was sent
> while I was in the Alps :-)
>
>
> On Wed, 20 Jun 2018 14:08:00 +0300
> Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> > The > should be >= to prevent an off by one bug.
>
> Well, not really.
>
> >
> > >From reviewing the code, it seems possible for
> > stack_trace_max.nr_entries to be set to .max_entries and in that case we
> > would be reading one element beyond the end of the stack_dump_trace[]
> > array. If it's not set to .max_entries then the bug doesn't affect
> > runtime.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
> > index 4237eba4ef20..6e3edd745c68 100644
> > --- a/kernel/trace/trace_stack.c
> > +++ b/kernel/trace/trace_stack.c
> > @@ -286,7 +286,7 @@ __next(struct seq_file *m, loff_t *pos)
> > {
> > long n = *pos - 1;
> >
> > - if (n > stack_trace_max.nr_entries || stack_dump_trace[n] == ULONG_MAX)
> > + if (n >= stack_trace_max.nr_entries || stack_dump_trace[n] == ULONG_MAX)
>
> We have:
>
> static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES+1] =
> { [0 ... (STACK_TRACE_ENTRIES)] = ULONG_MAX };
>
> And
>
> struct stack_trace stack_trace_max = {
> .max_entries = STACK_TRACE_ENTRIES - 1,
> .entries = &stack_dump_trace[0],
> };
>
>
> And nr_entries is set as this, and we have after that this:
>
> stack_trace_max.nr_entries = x;
> for (; x < i; x++)
> stack_dump_trace[x] = ULONG_MAX;
>
> Where we set stack_dump_trace[nr_entries] to ULONG_MAX.
>
> Thus, nr_entries will not go pass the size of stack_dump_trace.
>
> That said, if n == nr_entries, the second part of that if will always
> be true. And this is a bit subtle, so I will apply the patch. But it is
> not an off by one bug ;-)
Ah, yes. I follow that now. Thanks for taking the time to review this
patch.
I am optimistic that eventually I will fix how Smatch handles loops so
it maybe will be able to figure out that "x <= STACK_TRACE_ENTRIES - 1"
but that's probably some time off.
regards,
dan carpenter
prev parent reply other threads:[~2018-11-27 20:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 11:08 [PATCH] tracing: Fix an off by one in __next() Dan Carpenter
2018-11-27 18:44 ` Steven Rostedt
2018-11-27 20:04 ` Dan Carpenter [this message]
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=20181127200408.GG3073@unbuntlaptop \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/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