diff options
| author | Jacob Garber <jgarber1@ualberta.ca> | 2019-08-08 16:49:14 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-14 19:11:26 +0000 |
| commit | 26c3f19073bac4c01fdbf4e3417e341d235f60ab (patch) | |
| tree | 2dff50d68f613f8fa29f979004ca7762ab2de971 | |
| parent | 243c5efbde0f3bf3c9219bd8deb24bdf0ed952e2 (diff) | |
| download | vboot-26c3f19073bac4c01fdbf4e3417e341d235f60ab.tar.gz | |
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 <jgarber1@ualberta.ca>
Found-by: Coverity CID 198902
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1752522
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | futility/updater_archive.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |