Commit-ID: 515850e4fbd87c8f249446faa2e5ad98e672711d Gitweb: http://git.kernel.org/tip/515850e4fbd87c8f249446faa2e5ad98e672711d Author: Cody P Schafer <c...@linux.vnet.ibm.com> AuthorDate: Fri, 10 Aug 2012 15:22:54 -0700 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 13 Aug 2012 14:24:12 -0300
perf symbols: only set vmlinux longname & mark loaded if really loaded dso__load_vmlinux() uses the filename passed to it to directly set the dso long_name, which resulted in a use after free due to dso__load_vmlinux_path() treating 0 symbols as a load failure and subsequently freeing the contents of dso->long_name. Change dso__load_vmlinux() so that finding 0 symbols does not cause it to consider itself loaded, and do not set long_name in such a case. Signed-off-by: Cody P Schafer <c...@linux.vnet.ibm.com> Cc: David Hansen <d...@linux.vnet.ibm.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Matt Hellsley <matth...@us.ibm.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/1344637382-22789-9-git-send-email-c...@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/symbol.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index e5c3817..96dbf28 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1364,13 +1364,14 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, if (fd < 0) return -1; - dso__set_long_name(dso, (char *)vmlinux); - dso__set_loaded(dso, map->type); err = dso__load_sym(dso, map, symfs_vmlinux, fd, filter, 0, 0); close(fd); - if (err > 0) + if (err > 0) { + dso__set_long_name(dso, (char *)vmlinux); + dso__set_loaded(dso, map->type); pr_debug("Using %s for symbols\n", symfs_vmlinux); + } return err; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
