Commit 56bea424 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-fixes-for-v7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fix from Ard Biesheuvel:
 "Fix a potential buffer overrun issue introduced by the previous fix
  for EFI boot services region reservations on x86"

* tag 'efi-fixes-for-v7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size
parents a361474b 217c0a5c

arch/x86/platform/efi/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ void __init efi_unmap_boot_services(void) 
	if (efi_enabled(EFI_DBG))

		return;



	sz = sizeof(*ranges_to_free) * efi.memmap.nr_map + 1;

	sz = sizeof(*ranges_to_free) * (efi.memmap.nr_map + 1);

	ranges_to_free = kzalloc(sz, GFP_KERNEL);

	if (!ranges_to_free) {

		pr_err("Failed to allocate storage for freeable EFI regions\n");