From: Dan Carpenter <dan.carpenter@oracle.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>, Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] perf: potential underflow in perf_sample_ustack_size()
Date: Fri, 20 Sep 2013 14:37:36 +0300 [thread overview]
Message-ID: <20130920113736.GB8655@elgon.mountain> (raw)
The code here is trying to ensure that we don't have a
"header_size + stack_size" which is more than USHRT_MAX. I changed
the overflow check a little to make it more clear.
My concern here is that if "header_size + sizeof(u64)" is very large
then we could end up with underflow doing the subtraction and end up
with a "stack_size" larger than intended.
I don't know perf well enough to say if this is possible.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/kernel/events/core.c b/kernel/events/core.c
index dd236b6..eec9e683 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4217,11 +4217,13 @@ perf_sample_ustack_size(u16 stack_size, u16 header_size,
header_size += 2 * sizeof(u64);
/* Do we fit in with the current stack dump size? */
- if ((u16) (header_size + stack_size) < header_size) {
+ if (header_size > USHRT_MAX - stack_size) {
/*
* If we overflow the maximum size for the sample,
* we customize the stack dump size to fit in.
*/
+ if (header_size + sizeof(u64) > USHRT_MAX)
+ return 0;
stack_size = USHRT_MAX - header_size - sizeof(u64);
stack_size = round_up(stack_size, sizeof(u64));
}
next reply other threads:[~2013-09-20 11:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-20 11:37 Dan Carpenter [this message]
2013-09-21 13:35 ` Jiri Olsa
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=20130920113736.GB8655@elgon.mountain \
--to=dan.carpenter@oracle.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=jolsa@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.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
all inboxes | Powered by JetHome®