efi: Fix ESRT refresh after Capsule update

Indicated by Coverity Scan CID 331147

The ESRT was being refreshed in situations where the UpdateCapsule
procedure failed. In that scenario:

1) the ESRT refresh was superfluous.
2) a failed ESRT refresh return code overwrites the UpdateCapsule error
return code.

This commit ensures that the ESRT is only refreshed when the
UpdateCapsule performs successfully.

CC: Heinrich Schuchardt <[email protected]>
CC: Sughosh Ganu <[email protected]>
CC: AKASHI Takahiro <[email protected]>
CC: Tom Rini <[email protected]>
CC: Andre Przywara <[email protected]>
CC: [email protected]
Signed-off-by: Jose Marinho <[email protected]>
Reviewed-by: Heinrich Schuchardt <[email protected]>

diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 691eda5e0d1421ba89198c650a25e584873a29d9..a984c347e1efd15d86d48f9434e3bf1a904b283b 100644 (file)
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@@ -481,7 +481,6 @@ efi_status_t EFIAPI efi_update_capsule(
                if (ret != EFI_SUCCESS)
                        goto out;
        }
-out:
 
        if (IS_ENABLED(CONFIG_EFI_ESRT)) {
                /* Rebuild the ESRT to reflect any updated FW images. */
@@ -489,6 +488,7 @@ out:
                if (ret != EFI_SUCCESS)
                        log_warning("EFI Capsule: failed to update ESRT\n");
        }
+out:
 
        return EFI_EXIT(ret);
 }