diff options
| author | Joel Kitching <kitching@google.com> | 2021-04-22 18:55:10 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-15 19:35:50 +0000 |
| commit | ba23df230a9efe7f6aed8faab4dda944f62f76da (patch) | |
| tree | 6f8ae42ca70cdd8921344809845feeb6ae56fb39 | |
| parent | 0bffea9ab8c6acc30af0cb613ae4cdd48f865834 (diff) | |
| download | vboot-ba23df230a9efe7f6aed8faab4dda944f62f76da.tar.gz | |
vboot/vboot_kernel: stop printing keyblock version error when in dev mode
Previously, the "Key version too old." error message is printed
even when in dev mode (!need_keyblock_valid). Stop printing this
message when the key version check is not applicable.
This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.
BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I1c4605342a2c53c45b74be37f2ba597670654a8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2846252
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_kernel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index 8703697e..c0874881 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -251,10 +251,11 @@ static vb2_error_t vb2_verify_kernel_vblock( uint32_t key_version = keyblock->data_key.key_version; if (boot_mode != VB2_BOOT_MODE_RECOVERY) { if (key_version < (sd->kernel_version_secdata >> 16)) { - VB2_DEBUG("Key version too old.\n"); keyblock_valid = 0; - if (need_keyblock_valid) + if (need_keyblock_valid) { + VB2_DEBUG("Key version too old.\n"); return VB2_ERROR_KERNEL_KEYBLOCK_VERSION_ROLLBACK; + } } if (key_version > VB2_MAX_KEY_VERSION) { /* |