scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-01 21:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

crossystem: Fix null pointer dereference on VMs

Browse Source 
Check the result of VbSharedDataRead() before dereferencing it.

BUG=chromium:789276,chromium:819695
BRANCH=none
TEST=make runtests

Change-Id: I1b1cc90bdc2fca61a9aad6b02e8b7e1f6a919797
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/954712
Commit-Ready: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Randall Spangler
2018-03-07 21:06:15 -08:00
committed by chrome-bot
parent 9cc0e31fb5
commit 0bdb8713be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
host/lib/crossystem.c
View File

@@ -104,7 +104,7 @@ int vb2_get_nv_storage(enum vb2_nv_param param)
/* TODO: locking around NV access */
if (!vnc_read) {
memset(&cached_ctx, 0, sizeof(cached_ctx));
if (sh->flags & VBSD_NVDATA_V2)
if (sh && sh->flags & VBSD_NVDATA_V2)
cached_ctx.flags |= VB2_CONTEXT_NVDATA_V2;
if (0 != vb2_read_nv_storage(&cached_ctx))
return -1;
@@ -126,7 +126,7 @@ int vb2_set_nv_storage(enum vb2_nv_param param, int value)
/* TODO: locking around NV access */
memset(&ctx, 0, sizeof(ctx));
if (sh->flags & VBSD_NVDATA_V2)
if (sh && sh->flags & VBSD_NVDATA_V2)
ctx.flags |= VB2_CONTEXT_NVDATA_V2;
if (0 != vb2_read_nv_storage(&ctx))
return -1;