perf event: Check ref_reloc_sym before using it
Check for ref_reloc_sym before using it instead of checking symbol_conf.kptr_restrict and relying solely on that check. Reported-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Igor Lubashev <ilubashe@akamai.com> Tested-by: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: James Morris <jmorris@namei.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1566869956-7154-2-git-send-email-ilubashe@akamai.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
0a56e0603f
commit
e9a6882f26
@ -913,11 +913,13 @@ static int __perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
|
|||||||
int err;
|
int err;
|
||||||
union perf_event *event;
|
union perf_event *event;
|
||||||
|
|
||||||
if (symbol_conf.kptr_restrict)
|
|
||||||
return -1;
|
|
||||||
if (map == NULL)
|
if (map == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
kmap = map__kmap(map);
|
||||||
|
if (!kmap->ref_reloc_sym)
|
||||||
|
return -1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We should get this from /sys/kernel/sections/.text, but till that is
|
* We should get this from /sys/kernel/sections/.text, but till that is
|
||||||
* available use this, and after it is use this as a fallback for older
|
* available use this, and after it is use this as a fallback for older
|
||||||
@ -940,7 +942,6 @@ static int __perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
|
|||||||
event->header.misc = PERF_RECORD_MISC_GUEST_KERNEL;
|
event->header.misc = PERF_RECORD_MISC_GUEST_KERNEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
kmap = map__kmap(map);
|
|
||||||
size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),
|
size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),
|
||||||
"%s%s", machine->mmap_name, kmap->ref_reloc_sym->name) + 1;
|
"%s%s", machine->mmap_name, kmap->ref_reloc_sym->name) + 1;
|
||||||
size = PERF_ALIGN(size, sizeof(u64));
|
size = PERF_ALIGN(size, sizeof(u64));
|
||||||
|
Loading…
Reference in New Issue
Block a user