diff options
| author | Dave Young <dyoung@redhat.com> | 2013-12-20 18:02:15 +0800 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-12-21 15:29:26 +0000 |
| commit | a7f84f03f660d93574ac88835d056c0d6468aebe (patch) | |
| tree | dbc8727bcdfbfb8230cbd3ee19c6541562b2d7e8 /arch/x86/platform/efi/efi.c | |
| parent | 3b2664964bc886ae9d5127c8d3708b1acc0626d2 (diff) | |
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>
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index f8ec4dafc74e..15e3b5ea31b5 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -438,7 +438,7 @@ void __init efi_reserve_boot_services(void) * - Not within any part of the kernel * - Not the bios reserved area */ - if ((start+size >= __pa_symbol(_text) + if ((start + size > __pa_symbol(_text) && start <= __pa_symbol(_end)) || !e820_all_mapped(start, start+size, E820_RAM) || memblock_is_region_reserved(start, size)) { |