diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-29 16:19:10 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-29 16:19:10 -0500 |
| commit | d5c0c990c3128401810514c66b41b386096d206e (patch) | |
| tree | 963bd9ee0a9b2a355960b3c9eeef84dc52e8e011 /lib/efi_loader/efi_firmware.c | |
| parent | 341e8a6c7c09112a872d19f855fefa671df40eb7 (diff) | |
| parent | 21489b4478a72d6c682f24dea80d5ac7790e2692 (diff) | |
Merge tag 'efi-2024-04-rc1-4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-04-rc1-4
Documentation:
* uefi: remove ".py" suffix for pytest.py command
* correct date in migration plan for CONFIG_DM
UEFI:
* fix conflicting SPDX license in RISC-V EFI linker scripts
* page align EFI binary section in RISC-V EFI binaries
* separate .data and .text sections of RISC-V EFI binaries
* use common function to get EFI configuration table
Diffstat (limited to 'lib/efi_loader/efi_firmware.c')
| -rw-r--r-- | lib/efi_loader/efi_firmware.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c index 9fd13297a6..ba5aba098c 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -400,18 +400,18 @@ efi_status_t efi_firmware_set_fmp_state_var(struct fmp_state *state, u8 image_in } size = num_banks * sizeof(*var_state); - var_state = calloc(1, size); + var_state = malloc(size); if (!var_state) return EFI_OUT_OF_RESOURCES; /* * GetVariable may fail, EFI_NOT_FOUND is returned if FmpState * variable has not been set yet. - * Ignore the error here since the correct FmpState variable - * is set later. */ - efi_get_variable_int(varname, image_type_id, NULL, &size, var_state, - NULL); + ret = efi_get_variable_int(varname, image_type_id, NULL, &size, + var_state, NULL); + if (ret != EFI_SUCCESS) + memset(var_state, 0, num_banks * sizeof(*var_state)); /* * Only the fw_version is set here. |