Commit 11fac7a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Borislav Petkov:
 "Fix an out-of-bounds memory access when setting up a crash kernel with
  kexec"

* tag 'x86_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
parents 2a1d7946 5849cdf8

arch/x86/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params) 
	struct crash_memmap_data cmd;

	struct crash_mem *cmem;



	cmem = vzalloc(sizeof(struct crash_mem));

	cmem = vzalloc(struct_size(cmem, ranges, 1));

	if (!cmem)

		return -ENOMEM;