[U-Boot] [RFC] efi_loader: workaround for EDK2's shell.efi

AKASHI Takahiro takahiro.akashi at linaro.org
Thu Aug 9 06:15:38 UTC 2018


The commit 21b3edfc964 ("efi_loader: check parameters of CreateEvent")
enforces a strict parameter check at CreateEvent().  Unfortunately,
however, EDK2's Shell.efi calls this function with notify_tpl == 0.

The patch above does right thing and we'd better fix the issue on EDK2
side, and yet we might want a workaround allowing for running un-modified
version of EDK2 in short-term solution.

The patch provides a minimum mitigation of parameter check.

Signed-off-by: AKASHI Takahiro <takahiro.akashi at linaro.org>
---
 lib/efi_loader/efi_boottime.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 2281703f261..e7a19c35415 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -627,7 +627,8 @@ efi_status_t efi_create_event(uint32_t type, efi_uintn_t notify_tpl,
 		return EFI_INVALID_PARAMETER;
 	}
 
-	if (is_valid_tpl(notify_tpl) != EFI_SUCCESS)
+	/* notify_tpl == 0: workaround for EDK2's Shell.efi */
+	if (notify_tpl && (is_valid_tpl(notify_tpl) != EFI_SUCCESS))
 		return EFI_INVALID_PARAMETER;
 
 	evt = calloc(1, sizeof(struct efi_event));
-- 
2.18.0



More information about the U-Boot mailing list