summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/probe-event.c
diff options
context:
space:
mode:
authorWang Nan2015-04-07 10:22:45 +0200
committerArnaldo Carvalho de Melo2015-04-08 14:07:03 +0200
commitba92732e9808df679ddf75c5ea1c0caae6d7dce2 (patch)
treef00303efe3ed8cd3f2c5508d8af87db9b0137a82 /tools/perf/util/probe-event.c
parentperf evlist: Fix inverted logic in perf_mmap__empty (diff)
downloadkernel-qcow2-linux-ba92732e9808df679ddf75c5ea1c0caae6d7dce2.tar.gz
kernel-qcow2-linux-ba92732e9808df679ddf75c5ea1c0caae6d7dce2.tar.xz
kernel-qcow2-linux-ba92732e9808df679ddf75c5ea1c0caae6d7dce2.zip
perf kmaps: Check kmaps to make code more robust
This patch add checks in places where map__kmap is used to get kmaps from struct kmap. Error messages are added at map__kmap to warn invalid accessing of kmap (for the case of !map->dso->kernel, kmap(map) does not exists at all). Also, introduces map__kmaps() to warn uninitialized kmaps. Reviewed-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: pi3orama@163.com Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Zefan Li <lizefan@huawei.com> Link: http://lkml.kernel.org/r/1428394966-131044-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/probe-event.c')
-rw-r--r--tools/perf/util/probe-event.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 8feac0774c41..4fd49f021073 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -135,6 +135,8 @@ static struct ref_reloc_sym *kernel_get_ref_reloc_sym(void)
return NULL;
kmap = map__kmap(host_machine->vmlinux_maps[MAP__FUNCTION]);
+ if (!kmap)
+ return NULL;
return kmap->ref_reloc_sym;
}