x86/platform/efi/efi_64.c: fix problem in efi_ioremap in case of a failure in init_memory_mapping.
PATCH 1/1 x86/platform/efi/efi_64.c: fix problem in efi_ioremap in case of a failure in init_memory_mapping.
In the case that init_memory_mapping failed, returning a NULL, simply return. An attempt to recursively invoke efi_io_remap could result in mapping of a wrong range, 0 to size + physaddr, instead of the intended physaddr to physaddr + size - 1 range.
Signed-off-by T Makphaibulchoke <[email protected]>
--- arch/x86/platform/efi/efi_64.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
arch/x86/platform/efi/efi_64.c +8 -0
@@ -90,6 +90,14 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,return ioremap (phys_addr, size); last_map_pfn =init_memory_mapping (phys_addr, phys_addr + size); + +if (!last_map_pfn) { +/* Do not try to rmmap again in case of a failure */ +pr_warn ("%s: mapping of 0x%lx(0x%lx) failed.\n" , + __func__, phys_addr, size); +return NULL ; + } +if ((last_map_pfn <<PAGE_SHIFT ) < phys_addr + size) {unsigned long top = last_map_pfn <<PAGE_SHIFT ;efi_ioremap (top, size - (top - phys_addr), type);
Signature · 1 line
1.7.1