iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/urgent fix:

Browse Source 
- Fix segfault for kernel.kptr_restrict=2 (Jiri Olsa)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJZUVmHAAoJENZQFvNTUqpAEC0P/jTokI84ZBsycXXQp5B5kXFe
 AGA7zYFiuIZGw/mJ/llsO5Q+OClvEyx091vGJgTmIgW8Rz4Hzk+S3OXcKYrX8Rzd
 u1ZW6XeCieczJDg9wBO+dn7X+tkqRZnsoqZ7uNLK2HimzkO69nhip8lk/LBI+qdZ
 AkSry3YwuYqdVAVV4J4JqawqnSj1i3LxHcSxitZQfz/LimCe+PkqhOxU4WAv6+1G
 /akFnDd6p36ol6SRNfdwBWzV+IExjMbt5vO/sxApsmebQNXsb4o3xB065OnL9w9s
 k655FUMww36PKCXphMBcU5Tlq6cO1ss6wvmRb3fPp4Bd5dHTpzSDKHvL5B/eShHG
 K/Ag5+FypypdtIcWB8FSqDQGs2fyWFTYl4m46qnEA2MtLOflxiLwlUbDSAS4OD5R
 fHPWn3yZcGhZDPm9sdI5WAPB96OY0FRz6GcpoCMwvU+LMl9l+L9DWaWc28MQdldW
 b/WUJlrgz7zoVXVylu6CFn24OT8bI1gFoYHMdiXyT6MyEf4pwWznApGE8xNfvd40
 Y/s2sZIVysmZKhX/tRTBB/NUJ2WbmkxFKIDDaqhICgXyghWHVNP3yxx//t93Hd69
 2Kq2H4pHhtPyvzJgjT4UekLTYze0/S4lRhLLsYtHHpDrA/f4HMgY26pO2PPTABLA
 TYrIQI0ta7agJ64DueyQ
 =RAA8
 -----END PGP SIGNATURE-----

Merge tag 'perf-urgent-for-mingo-4.12-20170626' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Fix segfault for kernel.kptr_restrict=2 (Jiri Olsa)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2017-06-27 09:17:02 +02:00
commit e3c2c4fb52
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/perf/util/machine.c
View File

@ -1209,10 +1209,12 @@ int machine__create_kernel_maps(struct machine *machine)
*/
map_groups__fixup_end(&machine->kmaps);
if (machine__get_running_kernel_start(machine, &name, &addr)) {
} else if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {
machine__destroy_kernel_maps(machine);
return -1;
if (!machine__get_running_kernel_start(machine, &name, &addr)) {
if (name &&
maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {
machine__destroy_kernel_maps(machine);
return -1;
}
}
return 0;