From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Wed, 2 Jun 2021 17:28:22 +0000 (+0200)
Subject: efi_loader: efi_capsule_delete_file() NULL dereference
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e27b0ff1b7135f966c1379acde48134dd6b15545;p=u-boot.git

efi_loader: efi_capsule_delete_file() NULL dereference

If opening a file fails, the file handle pointer is not valid and must not
be dereferenced.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 9ead0d2c78..60309d4a07 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;
 }