Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a527bf61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 46589d7a e3c2c4fb

tools/perf/util/machine.c

+6 −4
Original line number Diff line number Diff line
@@ -1209,11 +1209,13 @@ 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)) {

	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;

}