leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: pkcs7_parse_message() returns error pointer

Browse Source 
Since pkcs7_parse_message() returns an error pointer, we must not
check for NULL.  We have to explicitly set msg to NULL in the error
case, otherwise the call to pkcs7_free_message() on the goto err
path will assume it's a valid object.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
Add missing include linux/err.h
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Patrick Wildt 2020-05-07 02:17:14 +02:00 committed by Heinrich Schuchardt
parent 9ad15227bb
commit 6f146155f8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/efi_loader/efi_image_loader.c
View File

@ -14,6 +14,7 @@
#include <pe.h> #include <pe.h>
#include <sort.h> #include <sort.h>
#include "crypto/pkcs7_parser.h" #include "crypto/pkcs7_parser.h"
#include <linux/err.h>
const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID; const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID; const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
@ -538,8 +539,9 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)
} }
msg = pkcs7_parse_message((void *)wincert + sizeof(*wincert), msg = pkcs7_parse_message((void *)wincert + sizeof(*wincert),
wincert->dwLength - sizeof(*wincert)); wincert->dwLength - sizeof(*wincert));
if (!msg) { if (IS_ERR(msg)) {
debug("Parsing image's signature failed\n"); debug("Parsing image's signature failed\n");
msg = NULL;
goto err; goto err;
} }