aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang, Yanmin <yanmin_zhang@linux.intel.com>2010-02-24 22:00:51 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 12:06:12 -0400
commit5f376564288d2b6959bdd8bf5442872cb97c7ac1 (patch)
tree57df30e3b8daecbfe0a7589522fddb9bb7f74197
parent00faf75b763d765c9360b5be47d47f190d53f32a (diff)
perf symbols: Check the right return variable
commit 37fe5fcb7a5b5235c8b71bf5469ce4c7246e3fab upstream. In function dso__split_kallsyms(), curr_map saves the return value of map__new2. So check it instead of var map after the call returns. Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <1267066851.1726.9.camel@localhost> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--tools/perf/util/symbol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index ab92763edb03..72547b914ad2 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -503,7 +503,7 @@ static int dso__split_kallsyms(struct dso *self, struct map *map,
503 return -1; 503 return -1;
504 504
505 curr_map = map__new2(pos->start, dso, map->type); 505 curr_map = map__new2(pos->start, dso, map->type);
506 if (map == NULL) { 506 if (curr_map == NULL) {
507 dso__delete(dso); 507 dso__delete(dso);
508 return -1; 508 return -1;
509 } 509 }