diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-31 14:20:22 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 08:23:53 +0000 |
| commit | e6b803355ee3dc548a4519a71b29672d856f9bc5 (patch) | |
| tree | 7b03cdfe30e9c0a91a4449b24010dabb335a4655 | |
| parent | e6700f4c70fe72850ae4f3f5df19c9281ebcefc8 (diff) | |
| download | vboot-e6b803355ee3dc548a4519a71b29672d856f9bc5.tar.gz | |
vboot: fix use of SetVirtualDevMode return values
SetVirtualDevMode returns vboot error codes, and not
TPM error codes. Existing code just so happens to work,
since TPM_SUCCESS == VBERROR_SUCCESS.
BUG=b:124141368, chromium:988410
TEST=Build locally
BRANCH=none
Change-Id: Ifc819fdea4e23824d8e6fcf211d7bf66f33cd069
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728293
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/mocked_rollback_index.c | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui.c | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/firmware/lib/mocked_rollback_index.c b/firmware/lib/mocked_rollback_index.c index 733b0a54..37b314a9 100644 --- a/firmware/lib/mocked_rollback_index.c +++ b/firmware/lib/mocked_rollback_index.c @@ -16,7 +16,7 @@ vb2_error_t SetVirtualDevMode(int val) { - return TPM_SUCCESS; + return VBERROR_SUCCESS; } uint32_t TPMClearAndReenable(void) diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 6187655b..1a59e674 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -617,7 +617,7 @@ vb2_error_t VbVerifyMemoryBootImage(struct vb2_context *ctx, vb2_error_t VbUnlockDevice(void) { VB2_DEBUG("Enabling dev-mode...\n"); - if (TPM_SUCCESS != SetVirtualDevMode(1)) + if (VBERROR_SUCCESS != SetVirtualDevMode(1)) return VBERROR_TPM_SET_BOOT_MODE_STATE; VB2_DEBUG("Mode change will take effect on next reboot.\n"); diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index cbf653d9..c93783a4 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -919,7 +919,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) switch (VbUserConfirms(ctx, vbc_flags)) { case 1: VB2_DEBUG("Enabling dev-mode...\n"); - if (TPM_SUCCESS != SetVirtualDevMode(1)) + if (VBERROR_SUCCESS != SetVirtualDevMode(1)) return VBERROR_TPM_SET_BOOT_MODE_STATE; VB2_DEBUG("Reboot so it will take " "effect\n"); diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index 5a0f117a..cad0d5a6 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -362,7 +362,7 @@ static vb2_error_t to_dev_action(struct vb2_context *ctx) return VBERROR_KEEP_LOOPING; VB2_DEBUG("Enabling dev-mode...\n"); - if (TPM_SUCCESS != SetVirtualDevMode(1)) + if (VBERROR_SUCCESS != SetVirtualDevMode(1)) return VBERROR_TPM_SET_BOOT_MODE_STATE; /* This was meant for headless devices, shouldn't really matter here. */ |