[GIT pull] perf fixes for 4.12

[Thomas Gleixner]

Linus,

please pull the latest perf-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
perf-urgent-for-linus

The last fix for perf for this cycles:

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


Thanks,

        tglx

------------------>
Jiri Olsa (1):
      perf machine: Fix segfault for kernel.kptr_restrict=2


 tools/perf/util/machine.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index d7f31cb0a4cb..5de2b86b9880 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -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;