Commit a7f84f03 authored Dec 20, 2013 by Dave Young Committed by Matt Fleming Dec 21, 2013

x86/efi: Fix off-by-one bug in EFI Boot Services reservation



Current code check boot service region with kernel text region by:
start+size >= __pa_symbol(_text)
The end of the above region should be start + size - 1 instead.

I see this problem in ovmf + Fedora 19 grub boot:
text start: 1000000 md start: 800000 md size: 800000

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Tested-by: Toshi Kani <toshi.kani@hp.com>
Cc: stable@vger.kernel.org
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent 3b266496

arch/x86/platform/efi/efi.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -438,7 +438,7 @@ void __init efi_reserve_boot_services(void)
	* - Not within any part of the kernel		* - Not within any part of the kernel
	* - Not the bios reserved area		* - Not the bios reserved area
	*/		*/
	if ((start+size >= __pa_symbol(_text)		if ((start + size > __pa_symbol(_text)
	&& start <= __pa_symbol(_end)) \|\|		&& start <= __pa_symbol(_end)) \|\|
	!e820_all_mapped(start, start+size, E820_RAM) \|\|		!e820_all_mapped(start, start+size, E820_RAM) \|\|
	memblock_is_region_reserved(start, size)) {		memblock_is_region_reserved(start, size)) {