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

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

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

Pull x86 fixes from Thomas Gleixner:
 "Fixlets for x86:

   - Prevent kexec crash when KASLR is enabled, which was caused by an
     address calculation bug

   - Restore the freeing of PUDs on memory hot remove

   - Correct a negated pointer check in the intel uncore performance
     monitoring driver

   - Plug a memory leak in an error exit path in the RDT code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel_rdt: Fix memory leak on mount failure
  x86/boot/KASLR: Fix kexec crash due to 'virt_addr' calculation bug
  x86/boot/KASLR: Add checking for the offset of kernel virtual address randomization
  perf/x86/intel/uncore: Fix wrong box pointer check
  x86/mm/hotplug: Fix BUG_ON() after hot-remove by not freeing PUD
parents a527bf61 79298acc

arch/x86/boot/compressed/kaslr.c

+0 −3
Original line number Diff line number Diff line
@@ -564,9 +564,6 @@ void choose_random_location(unsigned long input, 
{

	unsigned long random_addr, min_addr;



	/* By default, keep output position unchanged. */

	*virt_addr = *output;



	if (cmdline_find_option_bool("nokaslr")) {

		warn("KASLR disabled: 'nokaslr' on cmdline.");

		return;

arch/x86/boot/compressed/misc.c

+4 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap, 
				  unsigned long output_len)

{

	const unsigned long kernel_total_size = VO__end - VO__text;

	unsigned long virt_addr = (unsigned long)output;

	unsigned long virt_addr = LOAD_PHYSICAL_ADDR;



	/* Retain x86 boot parameters pointer passed from startup_32/64. */

	boot_params = rmode;
@@ -390,6 +390,8 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap, 
#ifdef CONFIG_X86_64

	if (heap > 0x3fffffffffffUL)

		error("Destination address too large");

	if (virt_addr + max(output_len, kernel_total_size) > KERNEL_IMAGE_SIZE)

		error("Destination virtual address is beyond the kernel mapping area");

#else

	if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))

		error("Destination address too large");
@@ -397,7 +399,7 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap, 
#ifndef CONFIG_RELOCATABLE

	if ((unsigned long)output != LOAD_PHYSICAL_ADDR)

		error("Destination address does not match LOAD_PHYSICAL_ADDR");

	if ((unsigned long)output != virt_addr)

	if (virt_addr != LOAD_PHYSICAL_ADDR)

		error("Destination virtual address changed when not relocatable");

#endif

arch/x86/boot/compressed/misc.h

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ static inline void choose_random_location(unsigned long input, 
					  unsigned long output_size,

					  unsigned long *virt_addr)

{

	/* No change from existing output location. */

	*virt_addr = *output;

}

#endif

arch/x86/events/intel/uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int uncore_event_cpu_online(unsigned int cpu) 
		pmu = type->pmus;

		for (i = 0; i < type->num_boxes; i++, pmu++) {

			box = pmu->boxes[pkg];

			if (!box && atomic_inc_return(&box->refcnt) == 1)

			if (box && atomic_inc_return(&box->refcnt) == 1)

				uncore_box_init(box);

		}

	}

arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

+3 −1
Original line number Diff line number Diff line
@@ -856,11 +856,13 @@ static struct dentry *rdt_mount(struct file_system_type *fs_type, 
	dentry = kernfs_mount(fs_type, flags, rdt_root,

			      RDTGROUP_SUPER_MAGIC, NULL);

	if (IS_ERR(dentry))

		goto out_cdp;

		goto out_destroy;



	static_branch_enable(&rdt_enable_key);

	goto out;



out_destroy:

	kernfs_remove(kn_info);

out_cdp:

	cdp_disable();

out: