scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 18:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot2: Allocate more buffer for kernel verification

Browse Source 
The low-level verification functions' *_WORKBUF_BYTES constants assume
the work buffer is already aligned to VB2_WORKBUF_ALIGN.  But malloc()
may return a less-aligned pointer, in which case vb2_workbuf_init()
aligns it (and loses a bit of space in the process).  This can cause an
error "vb2_rsa_verify_digest: ERROR - vboot2 work buffer too small!".

High-level functions should be using the *_WORKBUF_RECOMMENDED_SIZE
constants for allocation, which have enough padding to compensate for
alignment problems.

BUG=chrome-os-partner:59306
BRANCH=none
TEST=make runtests; boot a recovery image on reef

Change-Id: I1055fa56072b3fe1cd07c5c090293635c42c77a2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/406526
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Randall Spangler
2016-11-03 10:12:16 -07:00
parent 754ebdb8c3
commit a03a164a76
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/lib/vboot_api_kernel.c
View File

@@ -1403,12 +1403,10 @@ VbError_t VbVerifyMemoryBootImage(VbCommonParams *cparams,
retval = VBERROR_INVALID_KERNEL_FOUND;
/* Allocate work buffer */
workbuf = (uint8_t *)
VbExMalloc(VB2_VERIFY_KERNEL_PREAMBLE_WORKBUF_BYTES);
workbuf = (uint8_t *)VbExMalloc(VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE);
if (!workbuf)
goto fail;
vb2_workbuf_init(&wb, workbuf,
VB2_VERIFY_KERNEL_PREAMBLE_WORKBUF_BYTES);
vb2_workbuf_init(&wb, workbuf, VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE);
/* Verify the key block. */
key_block = (VbKeyBlockHeader *)kbuf;

6
firmware/lib/vboot_kernel.c
View File

@@ -152,12 +152,10 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
goto bad_gpt;
/* Allocate work buffer */
workbuf = (uint8_t *)
VbExMalloc(VB2_VERIFY_KERNEL_PREAMBLE_WORKBUF_BYTES);
workbuf = (uint8_t *)VbExMalloc(VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE);
if (!workbuf)
goto bad_gpt;
vb2_workbuf_init(&wb, workbuf,
VB2_VERIFY_KERNEL_PREAMBLE_WORKBUF_BYTES);
vb2_workbuf_init(&wb, workbuf, VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE);
/* Unpack kernel subkey */
struct vb2_public_key kernel_subkey2;