| Date | Fri, 12 Mar 2010 16:12:12 -0800 | From | Greg KH <> | Subject | [patch 034/123] perf symbols: Check the right return variable |
| |
2.6.33-stable review patch. If anyone has any objections, please let me know.
-----------------
From: Zhang, Yanmin <yanmin_zhang@linux.intel.com>
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>
--- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -503,7 +503,7 @@ static int dso__split_kallsyms(struct ds return -1; curr_map = map__new2(pos->start, dso, map->type); - if (map == NULL) { + if (curr_map == NULL) { dso__delete(dso); return -1; }
|