From 26c3f19073bac4c01fdbf4e3417e341d235f60ab Mon Sep 17 00:00:00 2001 From: Jacob Garber Date: Thu, 8 Aug 2019 16:49:14 -0600 Subject: futility: Add load_firmware_image() error check It is possible for load_firmware_image() to fail, in which case there will be a null pointer dereference of image.data in find_gbb(). Prevent this by returning early if load_firmware_image() fails. BUG=none TEST=make clean && make runtests BRANCH=none Change-Id: If60fdff2f3a39f07ef0b1e87f0800ac4fb8d5895 Signed-off-by: Jacob Garber Found-by: Coverity CID 198902 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1752522 Reviewed-by: Hung-Te Lin --- futility/updater_archive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/futility/updater_archive.c b/futility/updater_archive.c index afa04b98..1dd6d1d1 100644 --- a/futility/updater_archive.c +++ b/futility/updater_archive.c @@ -1030,7 +1030,8 @@ static void print_json_image( const struct vb2_gbb_header *gbb = NULL; if (!fpath) return; - load_firmware_image(&image, fpath, archive); + if (load_firmware_image(&image, fpath, archive)) + return; if (is_host) gbb = find_gbb(&image); else -- cgit v1.2.1