diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-09 08:20:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-09 08:20:24 -0400 |
| commit | 5e425a31d33f679549b85776f55181fc3cd3e3b2 (patch) | |
| tree | 5b86883311169cfcc642a8b9ad737e050a1ca571 /lib/efi_loader/efi_capsule.c | |
| parent | cb26d5a9265c60cee385d67eff86d115a606fbc5 (diff) | |
| parent | b95e5edc424a14c1d03848c03f92389a945d3e61 (diff) | |
Merge tag 'efi-2021-07-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-07-rc5
Documentation:
* pinmux and ums man-page
Bug fixes:
* Consider that partition numbers as hexadecimal.
* Avoid a possible NULL dereference in efi_capsule_delete_file().
Diffstat (limited to 'lib/efi_loader/efi_capsule.c')
| -rw-r--r-- | lib/efi_loader/efi_capsule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 9ead0d2c781..60309d4a07d 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -901,7 +901,8 @@ static efi_status_t efi_capsule_delete_file(const u16 *filename) /* ignore an error */ EFI_CALL((*dirh->close)(dirh)); - ret = EFI_CALL((*fh->delete)(fh)); + if (ret == EFI_SUCCESS) + ret = EFI_CALL((*fh->delete)(fh)); return ret; } |