linux-kernel - [PATCH] x86/platform/efi/efi_64.c: fix problem in efi_ioremap in case of a failure in init_memory

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1347404554-16975-1-git-send-email-tmac@hp.com>
Date:	Tue, 11 Sep 2012 17:02:34 -0600
From:	T Makphaibulchoke <tmac@...com>
To:	tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
	x86@...nel.org, matt.fleming@...el.com, keithp@...thp.com,
	linux-kernel@...r.kernel.org
Cc:	T Makphaibulchoke <tmac@...com>
Subject: [PATCH] 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 <tmac@...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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/