From: Patrick Wildt <patrick@blueri.se>
Date: Thu, 7 May 2020 00:13:18 +0000 (+0200)
Subject: efi_loader: efi_variable_parse_signature() returns NULL on error
X-Git-Tag: v2020.07-rc2~6^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ad15227bb92acc2bf73c60da1bcf2ae3774246d;p=oweals%2Fu-boot.git

efi_loader: efi_variable_parse_signature() returns NULL on error

efi_variable_parse_signature() returns NULL on error, so IS_ERR()
is an incorrect check.  The goto err leads to pkcs7_free_message(),
which works fine on a NULL ptr.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
Reviewed-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 568bd3ccfd..60c1201757 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -524,9 +524,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}