From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@redhat.com>,
Mike Galbraith <efault@gmx.de>, Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/16] perf tools: Do not accept parse_tag_value() overflow
Date: Wed, 23 Oct 2013 17:58:10 -0300 [thread overview]
Message-ID: <1382561895-8237-12-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1382561895-8237-1-git-send-email-acme@infradead.org>
From: Adrian Hunter <adrian.hunter@intel.com>
parse_tag_value() accepts an "unsigned long" and multiplies it according
to a tag character. Do not accept the value if the multiplication
overflows.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1382427258-17495-14-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/util.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index c25e57b3acb2..28a0a89c1f73 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -386,6 +386,8 @@ unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
if (s != endptr)
break;
+ if (value > ULONG_MAX / i->mult)
+ break;
value *= i->mult;
return value;
}
--
1.8.1.4
next prev parent reply other threads:[~2013-10-23 21:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 20:57 [GIT PULL 00/16] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 01/16] perf test: Clarify the "sample parsing" test entry Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 02/16] perf test: Consider PERF_SAMPLE_TRANSACTION in the "sample parsing" test Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 03/16] perf tools: Stop using 'self' in some more places Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 04/16] perf probe: Support "$vars" meta argument syntax for local variables Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 05/16] perf probe: Find fentry mcount fuzzed parameter location Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 06/16] perf bench: Change the procps visible command-name of invididual benchmark tests plus cleanups Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 07/16] perf sched: Make struct perf_sched sched a local variable Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 08/16] perf sched: Optimize build time Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 09/16] perf script: Make perf_script a local variable Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 10/16] perf inject: Do not repipe attributes to a perf.data file Arnaldo Carvalho de Melo
2013-10-23 20:58 ` Arnaldo Carvalho de Melo [this message]
2013-10-23 20:58 ` [PATCH 12/16] perf evlist: Validate that mmap_pages is not too big Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 13/16] perf tools: Fix non-debug build Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 14/16] perf ui: Rename ui_progress to ui_progress_ops Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 15/16] perf ui progress: Per progress bar state Arnaldo Carvalho de Melo
2013-10-23 20:58 ` [PATCH 16/16] perf tools: Show progress on histogram collapsing Arnaldo Carvalho de Melo
2013-10-24 6:52 ` [GIT PULL 00/16] perf/core improvements and fixes Ingo Molnar
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=1382561895-8237-12-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@gmail.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®