diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/include/vboot_api.h | 8 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 40 | ||||
| -rw-r--r-- | firmware/linktest/main.c | 1 |
3 files changed, 19 insertions, 30 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 38c5cbda..84b9d11c 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -31,6 +31,7 @@ extern "C" { #endif /* __cplusplus */ struct vb2_context; +typedef struct VbSharedDataHeader VbSharedDataHeader; /*****************************************************************************/ /* Error codes */ @@ -321,7 +322,7 @@ typedef struct VbSelectAndLoadKernelParams { * Returns VBERROR_SUCCESS if success, non-zero if error; on error, caller * should reboot. */ VbError_t VbSelectAndLoadKernel(struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams); /** @@ -334,15 +335,14 @@ VbError_t VbSelectAndLoadKernel(struct vb2_context *ctx, * does not check the image signature. * * @param ctx Vboot context - * @param cparams Common parameters, e.g. use member caller_context - * to point to useful context data + * @param shared Vboot1 VBSD struct * @param kparams kernel params * @param boot_image Image in memory that needs to be verified * @param image_size Size of the image in memory * @return VBERROR_... error, VBERROR_SUCCESS on success. */ VbError_t VbVerifyMemoryBootImage(struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams, void *boot_image, size_t image_size); diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 5d4c7c09..d5dda055 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -220,7 +220,7 @@ VbError_t VbBootNormal(struct vb2_context *ctx) } static VbError_t vb2_kernel_setup(struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams) { if (VB2_SUCCESS != vb2_init_context(ctx)) { @@ -229,9 +229,6 @@ static VbError_t vb2_kernel_setup(struct vb2_context *ctx, return VBERROR_INIT_SHARED_DATA; } - VbSharedDataHeader *shared = - (VbSharedDataHeader *)cparams->shared_data_blob; - /* Start timer */ shared->timer_vb_select_and_load_kernel_enter = VbExGetTimer(); @@ -347,31 +344,24 @@ static VbError_t vb2_kernel_phase4(struct vb2_context *ctx, return VBERROR_SUCCESS; } -static void vb2_kernel_cleanup(struct vb2_context *ctx, VbCommonParams *cparams) +static void vb2_kernel_cleanup(struct vb2_context *ctx) { - /* - * This must directly access cparams for now because we could have had - * an error setting up the vboot2 context. In that case - * vb2_shared_data is not available. - */ - VbSharedDataHeader *shared = - (VbSharedDataHeader *)cparams->shared_data_blob; - vb2_nv_commit(ctx); - /* Stop timer */ - shared->timer_vb_select_and_load_kernel_exit = VbExGetTimer(); - - /* Store how much shared data we used, if any */ - cparams->shared_data_size = shared->data_used; + /* vb2_shared_data may not have been initialized, and we may not have a + proper vbsd value. */ + struct vb2_shared_data *sd = vb2_get_sd(ctx); + if (sd->vbsd) + /* Stop timer */ + sd->vbsd->timer_vb_select_and_load_kernel_exit = VbExGetTimer(); } VbError_t VbSelectAndLoadKernel( struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams) { - VbError_t retval = vb2_kernel_setup(ctx, cparams, kparams); + VbError_t retval = vb2_kernel_setup(ctx, shared, kparams); if (retval) goto VbSelectAndLoadKernel_exit; @@ -442,7 +432,7 @@ VbError_t VbSelectAndLoadKernel( if (VBERROR_SUCCESS == retval) retval = vb2_kernel_phase4(ctx, kparams); - vb2_kernel_cleanup(ctx, cparams); + vb2_kernel_cleanup(ctx); /* Pass through return value from boot path */ VB2_DEBUG("Returning %d\n", (int)retval); @@ -450,7 +440,7 @@ VbError_t VbSelectAndLoadKernel( } VbError_t VbVerifyMemoryBootImage( - struct vb2_context *ctx, VbCommonParams *cparams, + struct vb2_context *ctx, VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams, void *boot_image, size_t image_size) { @@ -464,13 +454,11 @@ VbError_t VbVerifyMemoryBootImage( uint32_t allow_fastboot_full_cap = 0; struct vb2_workbuf wb; - VbError_t retval = vb2_kernel_setup(ctx, cparams, kparams); + VbError_t retval = vb2_kernel_setup(ctx, shared, kparams); if (retval) goto fail; - struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); - VbSharedDataHeader *shared = sd->vbsd; if ((boot_image == NULL) || (image_size == 0)) { retval = VBERROR_INVALID_PARAMETER; @@ -601,7 +589,7 @@ VbError_t VbVerifyMemoryBootImage( retval = VBERROR_SUCCESS; fail: - vb2_kernel_cleanup(ctx, cparams); + vb2_kernel_cleanup(ctx); if (NULL != kernel_subkey) free(kernel_subkey); return retval; diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c index 29bd9702..95a5d0fc 100644 --- a/firmware/linktest/main.c +++ b/firmware/linktest/main.c @@ -55,6 +55,7 @@ int main(void) /* vboot_api.h - entry points INTO vboot_reference */ VbSelectAndLoadKernel(0, 0, 0); + VbVerifyMemoryBootImage(0, 0, 0, 0, 0); /* vboot_common.h */ OffsetOf(0, 0); |