All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] efi/arm64: handle missing virtual mapping for UEFI System Table
@ 2014-07-04 15:25 ` Ard Biesheuvel
  0 siblings, 0 replies; 18+ messages in thread
From: Ard Biesheuvel @ 2014-07-04 15:25 UTC (permalink / raw)
  To: matt.fleming-ral2JQCrhuEAvxtiuMwx3w, catalin.marinas-5wv7dgnIgG8,
	msalter-H+wXaHxf7aLQT0dZR+AlfA
  Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	leif.lindholm-QSEj5FYQhm4dnm+yROfE0A, Ard Biesheuvel

If we cannot resolve the virtual address of the UEFI System Table, its physical
offset must be missing from the virtual memory map, and there is really no point
in proceeding with installing the virtual memory map and the runtime services
dispatch table. So back out gracefully.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm64/kernel/efi.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index 56c3327bbf79..e72f3100958f 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -414,13 +414,24 @@ static int __init arm64_enter_virtual_mode(void)
 	for_each_efi_memory_desc(&memmap, md) {
 		if (!(md->attribute & EFI_MEMORY_RUNTIME))
 			continue;
-		if (remap_region(md, &virt_md))
-			++count;
+		if (!remap_region(md, &virt_md))
+			goto err_unmap;
+		++count;
 	}
 
 	efi.systab = (__force void *)efi_lookup_mapped_addr(efi_system_table);
-	if (efi.systab)
-		set_bit(EFI_SYSTEM_TABLES, &efi.flags);
+	if (!efi.systab) {
+		/*
+		 * If we have no virtual mapping for the System Table at this
+		 * point, the memory map doesn't cover the physical offset where
+		 * it resides. This means the System Table will be inaccessible
+		 * to Runtime Services themselves once the virtual mapping is
+		 * installed.
+		 */
+		pr_err("Failed to remap EFI System Table -- buggy firmware?\n");
+		goto err_unmap;
+	}
+	set_bit(EFI_SYSTEM_TABLES, &efi.flags);
 
 	local_irq_save(flags);
 	cpu_switch_mm(idmap_pg_dir, &init_mm);
@@ -453,5 +464,14 @@ static int __init arm64_enter_virtual_mode(void)
 	set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
 
 	return 0;
+
+err_unmap:
+	/* unmap all mappings that succeeded: there are 'count' of those */
+	for (virt_md = virtmap; count--; virt_md += memmap.desc_size) {
+		md = virt_md;
+		iounmap((__force void __iomem *)md->virt_addr);
+	}
+	kfree(virtmap);
+	return -1;
 }
 early_initcall(arm64_enter_virtual_mode);
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2014-07-18 21:18 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-04 15:25 [PATCH v3] efi/arm64: handle missing virtual mapping for UEFI System Table Ard Biesheuvel
2014-07-04 15:25 ` Ard Biesheuvel
     [not found] ` <1404487509-26084-1-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-07-04 16:52   ` Mark Salter
2014-07-04 16:52     ` Mark Salter
     [not found]     ` <1404492756.19665.57.camel-PDpCo7skNiwAicBL8TP8PQ@public.gmane.org>
2014-07-04 17:01       ` Catalin Marinas
2014-07-04 17:01         ` Catalin Marinas
     [not found]         ` <20140704170110.GM16404-5wv7dgnIgG8@public.gmane.org>
2014-07-04 17:19           ` Ard Biesheuvel
2014-07-04 17:19             ` Ard Biesheuvel
     [not found]             ` <CAKv+Gu_-=NtVNFLEh35Pv8OO6nLe1YhPjS13MYZa93YOXFOh6Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-05  7:25               ` Catalin Marinas
2014-07-05  7:25                 ` Catalin Marinas
     [not found]                 ` <09C85B92-02BB-45C4-A461-D4E0CD4F7203-5wv7dgnIgG8@public.gmane.org>
2014-07-07 20:11                   ` Matt Fleming
2014-07-07 20:11                     ` Matt Fleming
     [not found]                     ` <20140707201103.GB27474-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-07-07 20:38                       ` Ard Biesheuvel
2014-07-07 20:38                         ` Ard Biesheuvel
     [not found]                         ` <CAKv+Gu9aksvu3kOVt9GAA8jGdR0DkUUJ2iT3RMS-kEZ-OOkH2w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-18 18:42                           ` Ard Biesheuvel
     [not found]                             ` <CAKv+Gu8PW2C3=Y5+fwQbCttLp7S4a=qD5n_CRK-FM9cN84kzOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-18 19:31                               ` Matt Fleming
     [not found]                                 ` <20140718193141.GA27099-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-07-18 20:11                                   ` Ard Biesheuvel
     [not found]                                     ` <CAKv+Gu-DTRi8Fjv_u_6bHCF1UTKVaok6vy3RjjvBG53Qa5wv3Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-18 21:18                                       ` Matt Fleming

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.