diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-10 17:11:59 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 21:32:26 -0700 |
| commit | 144d06f8e74d8c4aa25d24a8e483db3e841e9e7d (patch) | |
| tree | 71dff1821aed923e96a72de5ff7df6cb272e1d73 /firmware | |
| parent | dccea9ae88059c8cb7dff76d2682835184fc8338 (diff) | |
| download | vboot-144d06f8e74d8c4aa25d24a8e483db3e841e9e7d.tar.gz | |
vboot: remove workbuf alloc and free code
Workbuf should be allocated and free'd by vboot caller.
BUG=b:124141368, chromium:951692
TEST=make clean && make runtests
CQ-DEPEND=CL:1563872
BRANCH=none
Change-Id: Ibaa70f62c660d46cc083a5e55a73b961eb813649
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1560716
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index c08ca131..11a16595 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -26,7 +26,6 @@ /* Global variables */ static struct RollbackSpaceFwmp fwmp; static LoadKernelParams lkp; -static uint8_t *unaligned_workbuf; #ifdef CHROMEOS_ENVIRONMENT /* Global variable accessors for unit tests */ @@ -224,6 +223,12 @@ static VbError_t vb2_kernel_setup(struct vb2_context *ctx, VbCommonParams *cparams, VbSelectAndLoadKernelParams *kparams) { + if (VB2_SUCCESS != vb2_init_context(ctx)) { + VB2_DEBUG("Can't init vb2_context\n"); + VbSetRecoveryRequest(ctx, VB2_RECOVERY_RW_SHARED_DATA); + return VBERROR_INIT_SHARED_DATA; + } + VbSharedDataHeader *shared = (VbSharedDataHeader *)cparams->shared_data_blob; @@ -255,31 +260,6 @@ static VbError_t vb2_kernel_setup(struct vb2_context *ctx, VbExNvStorageRead(ctx->nvdata); vb2_nv_init(ctx); - ctx->workbuf_size = VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE + - VB2_WORKBUF_ALIGN; - - unaligned_workbuf = ctx->workbuf = malloc(ctx->workbuf_size); - if (!unaligned_workbuf) { - VB2_DEBUG("Can't allocate work buffer\n"); - VbSetRecoveryRequest(ctx, VB2_RECOVERY_RW_SHARED_DATA); - return VBERROR_INIT_SHARED_DATA; - } - - if (VB2_SUCCESS != vb2_align(&ctx->workbuf, &ctx->workbuf_size, - VB2_WORKBUF_ALIGN, - VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE)) { - VB2_DEBUG("Can't align work buffer\n"); - VbSetRecoveryRequest(ctx, VB2_RECOVERY_RW_SHARED_DATA); - return VBERROR_INIT_SHARED_DATA; - } - - if (VB2_SUCCESS != vb2_init_context(ctx)) { - VB2_DEBUG("Can't init vb2_context\n"); - free(unaligned_workbuf); - VbSetRecoveryRequest(ctx, VB2_RECOVERY_RW_SHARED_DATA); - return VBERROR_INIT_SHARED_DATA; - } - struct vb2_shared_data *sd = vb2_get_sd(ctx); sd->recovery_reason = shared->recovery_reason; @@ -381,15 +361,6 @@ static void vb2_kernel_cleanup(struct vb2_context *ctx, VbCommonParams *cparams) VbSharedDataHeader *shared = (VbSharedDataHeader *)cparams->shared_data_blob; - /* - * Clean up vboot context. - * - * TODO: This should propagate up to higher levels - */ - - /* Free buffers */ - free(unaligned_workbuf); - vb2_nv_commit(ctx); /* Stop timer */ |