* [PATCH] x86/platform/efi/efi_64.c: fix problem in efi_ioremap in case of a failure in init_memory_mapping.
@ 2012-09-11 23:02 T Makphaibulchoke
0 siblings, 0 replies; only message in thread
From: T Makphaibulchoke @ 2012-09-11 23:02 UTC (permalink / raw)
To: tglx, mingo, hpa, x86, matt.fleming, keithp, linux-kernel
Cc: T Makphaibulchoke
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 <tmac@hp.com>
---
arch/x86/platform/efi/efi_64.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index ac3aa54..5d032e9 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -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);
--
1.7.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-11 23:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-11 23:02 [PATCH] x86/platform/efi/efi_64.c: fix problem in efi_ioremap in case of a failure in init_memory_mapping T Makphaibulchoke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).