From: Emekcan Aras <emekcan.a...@arm.com> Add missing checks according to the UEFI specification [1]
checks added for these capsule flags: CAPSULE_FLAGS_PERSIST_ACROSS_RESET CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE CAPSULE_FLAGS_INITIATE_RESET [1]: Table 8.8 Flag Firmware Behavior, https://uefi.org/specs/UEFI/2.10/08_Services_Runtime_Services.html Signed-off-by: Emekcan Aras <emekcan.a...@arm.com> Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhl...@arm.com> Cc: Heinrich Schuchardt <xypron.g...@gmx.de> Cc: Ilias Apalodimas <ilias.apalodi...@linaro.org> Cc: Tom Rini <tr...@konsulko.com> Cc: Simon Glass <s...@chromium.org> Cc: Adriano Cordova <adria...@gmail.com> Cc: Sughosh Ganu <sughosh.g...@linaro.org> --- Changelog of changes: =========================== v2: * As suggested by Heinrich: Simplify the logic v1: * Add runtime capsule flags checks lib/efi_loader/efi_capsule.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 113cfe30fde..2c8fd74365f 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -769,6 +769,17 @@ efi_status_t EFIAPI efi_update_capsule( continue; } + if (capsule->flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) { + if (!scatter_gather_list) { + ret = EFI_INVALID_PARAMETER; + goto out; + } + } else if (capsule->flags & (CAPSULE_FLAGS_INITIATE_RESET | + CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) { + ret = EFI_INVALID_PARAMETER; + goto out; + } + log_debug("Capsule[%d] (guid:%pUs)\n", i, &capsule->capsule_guid); ret = efi_capsule_update_firmware(capsule); -- 2.25.1