All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] efi: Check EFI revision in setup_efi_vars
@ 2013-04-24 14:37 ` Josh Boyer
  0 siblings, 0 replies; 12+ messages in thread
From: Josh Boyer @ 2013-04-24 14:37 UTC (permalink / raw)
  To: Matthew Garrett, Matt Fleming
  Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

We need to check the runtime sys_table for the EFI version the firmware
specifies instead of just checking for a NULL QueryVariableInfo.  Older
implementations of EFI don't have QueryVariableInfo but the runtime is
a smaller structure, so the pointer to it may be pointing off into garbage.

This is apparently the case with several Apple firmwares that support EFI
1.10, and the current check causes them to no longer boot.  Fix based on
a suggestion from Matthew Garrett.

Signed-off-by: Josh Boyer <jwboyer-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/x86/boot/compressed/eboot.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 8615f75..b46efbf 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -258,7 +258,9 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	u64 store_size, remaining_size, var_size;
 	efi_status_t status;
 
-	if (!sys_table->runtime->query_variable_info)
+	if (sys_table->runtime->hdr.revision < EFI_2_00_SYSTEM_TABLE_REVISION)
+		return EFI_UNSUPPORTED;
+	else if(!sys_table->runtime->query_variable_info)
 		return EFI_UNSUPPORTED;
 
 	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
-- 
1.8.1.4

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

end of thread, other threads:[~2013-04-24 15:20 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-24 14:37 [PATCH] efi: Check EFI revision in setup_efi_vars Josh Boyer
2013-04-24 14:37 ` Josh Boyer
     [not found] ` <20130424143738.GB15272-dHPIJuKSOV01V+h/cAXI7w8O6CCKKCg3HZ5vskTnxNA@public.gmane.org>
2013-04-24 14:44   ` Matt Fleming
2013-04-24 14:44     ` Matt Fleming
2013-04-24 14:54     ` Josh Boyer
     [not found]       ` <20130424145449.GC15272-dHPIJuKSOV01V+h/cAXI7w8O6CCKKCg3HZ5vskTnxNA@public.gmane.org>
2013-04-24 14:57         ` Matt Fleming
2013-04-24 14:57           ` Matt Fleming
     [not found]           ` <5177F2C3.5080907-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2013-04-24 15:01             ` Matthew Garrett
2013-04-24 15:01               ` Matthew Garrett
2013-04-24 15:16               ` [PATCH v2] " Josh Boyer
2013-04-24 15:16                 ` Josh Boyer
2013-04-24 15:20                 ` 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.