Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Thomas Gleixner:
"The last fix for perf for this cycles:

- Prevent a segfault when kernel.kptr_restrict=2 is set by avoiding a
null pointer dereference"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf machine: Fix segfault for kernel.kptr_restrict=2

Changed files
+6 -4
tools
perf
util
+6 -4
tools/perf/util/machine.c
··· 1209 1209 */ 1210 1210 map_groups__fixup_end(&machine->kmaps); 1211 1211 1212 - if (machine__get_running_kernel_start(machine, &name, &addr)) { 1213 - } else if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) { 1214 - machine__destroy_kernel_maps(machine); 1215 - return -1; 1212 + if (!machine__get_running_kernel_start(machine, &name, &addr)) { 1213 + if (name && 1214 + maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) { 1215 + machine__destroy_kernel_maps(machine); 1216 + return -1; 1217 + } 1216 1218 } 1217 1219 1218 1220 return 0;