From 19788a7d88397e2d9df3881c39a9111f365fa3cf Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Thu, 13 Feb 2020 18:01:42 +0800 Subject: vboot: use VB2_SD_FLAG_KERNEL_SIGNED Use vboot2 variant VB2_SD_FLAG_KERNEL_SIGNED instead of vboot1 VBSD flag VBSD_KERNEL_KEY_VERIFIED. Export the flag back to vboot1 at the end of VBSLK. BUG=b:124141368, chromium:1038260 TEST=make clean && make runtests BRANCH=none Change-Id: Ie7516195b95a9ef2ca254616c9486991b1a418fa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2053181 Tested-by: Joel Kitching Commit-Queue: Joel Kitching Reviewed-by: Joel Kitching --- firmware/lib/vboot_api_kernel.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'firmware/lib/vboot_api_kernel.c') diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 36bac6ed..822f1cbe 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -428,6 +428,10 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, if (rv == VB2_SUCCESS) vb2_kernel_fill_kparams(ctx, kparams); + /* Translate vboot2 flags and fields into vboot1. */ + if (sd->flags & VB2_SD_FLAG_KERNEL_SIGNED) + sd->vbsd->flags |= VBSD_KERNEL_KEY_VERIFIED; + /* Commit data, but retain any previous errors */ call_rv = vb2_commit_data(ctx); if (rv == VB2_SUCCESS) -- cgit v1.2.1