]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
perf tools: Do not accept parse_tag_value() overflow
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 22 Oct 2013 07:34:17 +0000 (10:34 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 23 Oct 2013 13:59:09 +0000 (10:59 -0300)
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

index c25e57b3acb2994d7d53b8089f1897030b71efb7..28a0a89c1f739749a59c8b80aa3d3b37d8f4000f 100644 (file)
@@ -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;
                }