diff options
author | Joel Kitching <kitching@google.com> | 2019-12-09 18:51:00 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-01-22 09:02:03 +0000 |
commit | e22ceb974fc551e41ca588c2b524a0a91fbe5d5a (patch) | |
tree | 02206aebc187cf0fe5c21d2ed1ccf7a5b3c82418 /tests | |
parent | 39e34fb71632d2a20363f53d2671c98bc972a093 (diff) | |
download | vboot-e22ceb974fc551e41ca588c2b524a0a91fbe5d5a.tar.gz |
vboot: remove secdata TPM backend code
In vboot 2 design, secdata spaces are read/written by the vboot
caller, and not by vboot itself. We still need to maintain a
vb2ex_commit_data callback for edge cases, such as when the vboot
UI prompts the user to reboot.
BUG=b:124141368, chromium:972956
TEST=Build locally, flash and boot eve,
check logs for secdata writes and locks
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib3b628549185749a290dd65e297f2e19adecbc66
Cq-Depend: chromium:1958012
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1958070
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/secdata_tpm_tests.c | 587 | ||||
-rw-r--r-- | tests/vb2_auxfw_sync_tests.c | 1 | ||||
-rw-r--r-- | tests/vb2_ec_sync_tests.c | 1 | ||||
-rw-r--r-- | tests/vboot_api_devmode_tests.c | 1 | ||||
-rw-r--r-- | tests/vboot_api_kernel2_tests.c | 6 | ||||
-rw-r--r-- | tests/vboot_api_kernel4_tests.c | 112 | ||||
-rw-r--r-- | tests/vboot_api_kernel_tests.c | 1 | ||||
-rw-r--r-- | tests/vboot_detach_menu_tests.c | 6 | ||||
-rw-r--r-- | tests/vboot_display_tests.c | 1 | ||||
-rw-r--r-- | tests/vboot_kernel_tests.c | 1 |
10 files changed, 50 insertions, 667 deletions
diff --git a/tests/secdata_tpm_tests.c b/tests/secdata_tpm_tests.c deleted file mode 100644 index 32285ded..00000000 --- a/tests/secdata_tpm_tests.c +++ /dev/null @@ -1,587 +0,0 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Tests for TPM secure data space functions - */ - -#include "2api.h" -#include "2secdata.h" -#include "secdata_tpm.h" -#include "test_common.h" -#include "tlcl.h" -#include "tss_constants.h" -#include "vboot_test.h" - -/* - * Buffer to hold accumulated list of calls to mocked Tlcl functions. - * Each function appends itself to the buffer and updates mock_cnext. - * - * Size of mock_calls[] should be big enough to handle all expected - * call sequences; 16KB should be plenty since none of the sequences - * below is more than a few hundred bytes. We could be more clever - * and use snprintf() with length checking below, at the expense of - * making all the mock implementations bigger. If this were code used - * outside of unit tests we'd want to do that, but here if we did - * overrun the buffer the worst that's likely to happen is we'll crash - * the test, and crash = failure anyway. - */ -static char mock_calls[16384]; -static char *mock_cnext = mock_calls; - -/* - * Variables to support mocked error values from Tlcl functions. Each - * call, mock_count is incremented. If mock_count==fail_at_count, return - * fail_with_error instead of the normal return value. - */ -static int mock_count = 0; -static int fail_at_count = 0; -static uint32_t fail_with_error = TPM_SUCCESS; -static int mock_bad_crc = 0; - -/* Params / backing store for mocked Tlcl functions. */ -static TPM_PERMANENT_FLAGS mock_pflags; -static uint8_t mock_rsf[VB2_SECDATA_FIRMWARE_SIZE]; -static uint8_t mock_rsk[VB2_SECDATA_KERNEL_SIZE]; -static uint8_t mock_fwmp[VB2_SECDATA_FWMP_MAX_SIZE]; -static uint32_t mock_fwmp_real_size; -static uint32_t mock_permissions; - -static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] - __attribute__ ((aligned (VB2_WORKBUF_ALIGN))); -static struct vb2_context *ctx; - -/* Reset the variables for the Tlcl mock functions. */ -static void reset_common_data(int fail_on_call, uint32_t fail_with_err) -{ - *mock_calls = 0; - mock_cnext = mock_calls; - mock_count = 0; - fail_at_count = fail_on_call; - fail_with_error = fail_with_err; - mock_bad_crc = 0; - - memset(&mock_pflags, 0, sizeof(mock_pflags)); - - /* Use value other than 0 for memcmp() checks */ - memset(&mock_rsf, 0xa6, sizeof(mock_rsf)); - memset(&mock_rsk, 0xa7, sizeof(mock_rsk)); - memset(&mock_fwmp, 0xa8, sizeof(mock_fwmp)); - - mock_fwmp_real_size = VB2_SECDATA_FWMP_MIN_SIZE; - - /* Note: only used when TPM2_MODE is disabled. */ -#ifndef TPM2_MODE - mock_permissions = TPM_NV_PER_PPWRITE; -#else - mock_permissions = 0; -#endif - - secdata_kernel_locked = 0; - - TEST_SUCC(vb2api_init(workbuf, sizeof(workbuf), &ctx), - "vb2api_init failed"); - - ctx->flags |= VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED; - ctx->flags |= VB2_CONTEXT_SECDATA_KERNEL_CHANGED; - ctx->flags |= VB2_CONTEXT_RECOVERY_MODE; -} - -/* Mock functions */ - -vb2_error_t vb2api_secdata_firmware_check(struct vb2_context *c) -{ - if (mock_bad_crc) - return VB2_ERROR_SECDATA_FIRMWARE_CRC; - - return VB2_SUCCESS; -} - -vb2_error_t vb2api_secdata_kernel_check(struct vb2_context *c) -{ - if (mock_bad_crc) - return VB2_ERROR_SECDATA_FIRMWARE_CRC; - - return VB2_SUCCESS; -} - -vb2_error_t vb2api_secdata_fwmp_check(struct vb2_context *c, uint8_t *size) -{ - if (*size < mock_fwmp_real_size) { - *size = mock_fwmp_real_size; - return VB2_ERROR_SECDATA_FWMP_INCOMPLETE; - } - - if (mock_bad_crc) - return VB2_ERROR_SECDATA_FIRMWARE_CRC; - - return VB2_SUCCESS; -} - -/****************************************************************************/ -/* Mocks for tlcl functions which log the calls made to mock_calls[]. */ - -uint32_t TlclLibInit(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclLibInit()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclStartup(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclStartup()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclResume(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclResume()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclForceClear(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclForceClear()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclSetEnable(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclSetEnable()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclSetDeactivated(uint8_t flag) -{ - mock_cnext += sprintf(mock_cnext, "TlclSetDeactivated(%d)\n", flag); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclRead(uint32_t index, void* data, uint32_t length) -{ - mock_cnext += sprintf(mock_cnext, "TlclRead(%#x, %d)\n", - index, length); - - if (FIRMWARE_NV_INDEX == index) { - TEST_EQ(length, sizeof(mock_rsf), "TlclRead rsf size"); - memcpy(data, &mock_rsf, length); - } else if (KERNEL_NV_INDEX == index) { - TEST_EQ(length, sizeof(mock_rsk), "TlclRead rsk size"); - memcpy(data, &mock_rsk, length); - } else if (FWMP_NV_INDEX == index) { - memset(data, 0, length); - if (length > sizeof(mock_fwmp)) - length = sizeof(mock_fwmp); - memcpy(data, &mock_fwmp, length); - } else { - memset(data, 0, length); - } - - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclWrite(uint32_t index, const void *data, uint32_t length) -{ - mock_cnext += sprintf(mock_cnext, "TlclWrite(%#x, %d)\n", - index, length); - - if (FIRMWARE_NV_INDEX == index) { - TEST_EQ(length, sizeof(mock_rsf), "TlclWrite rsf size"); - memcpy(&mock_rsf, data, length); - } else if (KERNEL_NV_INDEX == index) { - TEST_EQ(length, sizeof(mock_rsk), "TlclWrite rsk size"); - memcpy(&mock_rsk, data, length); - } - - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclDefineSpace(uint32_t index, uint32_t perm, uint32_t size) -{ - mock_cnext += sprintf(mock_cnext, "TlclDefineSpace(%#x, %#x, %d)\n", - index, perm, size); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclSelfTestFull(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclSelfTestFull()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclContinueSelfTest(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclContinueSelfTest()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS *pflags) -{ - mock_cnext += sprintf(mock_cnext, "TlclGetPermanentFlags()\n"); - memcpy(pflags, &mock_pflags, sizeof(mock_pflags)); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -/* TlclGetFlags() doesn't need mocking; it calls TlclGetPermanentFlags() */ - -uint32_t TlclAssertPhysicalPresence(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclAssertPhysicalPresence()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclPhysicalPresenceCMDEnable(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclPhysicalPresenceCMDEnable()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclSetGlobalLock(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclSetGlobalLock()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclLockPhysicalPresence(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclLockPhysicalPresence()\n"); - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -#ifndef TPM2_MODE -uint32_t TlclGetPermissions(uint32_t index, uint32_t* permissions) -{ - mock_cnext += sprintf(mock_cnext, "TlclGetPermissions(%#x)\n", index); - *permissions = mock_permissions; - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclFinalizePhysicalPresence(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclFinalizePhysicalPresence()\n"); - mock_pflags.physicalPresenceLifetimeLock = 1; - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} - -uint32_t TlclSetNvLocked(void) -{ - mock_cnext += sprintf(mock_cnext, "TlclSetNvLocked()\n"); - mock_pflags.nvLocked = 1; - return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS; -} -#endif - -/****************************************************************************/ -/* Tests for misc helper functions */ - -static void misc_tests(void) -{ - uint8_t buf[8]; - - reset_common_data(0, 0); - TEST_EQ(tlcl_clear_and_reenable(), 0, "tlcl_clear_and_enable()"); - TEST_STR_EQ(mock_calls, - "TlclForceClear()\n" - "TlclSetEnable()\n" - "TlclSetDeactivated(0)\n", - " tlcl calls"); - - reset_common_data(0, 0); - TEST_EQ(tlcl_safe_write(0x123, buf, 8), 0, "tlcl_safe_write()"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x123, 8)\n", - " tlcl calls"); - - reset_common_data(1, TPM_E_BADINDEX); - TEST_EQ(tlcl_safe_write(0x123, buf, 8), TPM_E_BADINDEX, - "tlcl_safe_write() bad"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x123, 8)\n", - " tlcl calls"); - - reset_common_data(1, TPM_E_MAXNVWRITES); - TEST_EQ(tlcl_safe_write(0x123, buf, 8), 0, - "tlcl_safe_write() retry max writes"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x123, 8)\n" - "TlclForceClear()\n" - "TlclSetEnable()\n" - "TlclSetDeactivated(0)\n" - "TlclWrite(0x123, 8)\n", - " tlcl calls"); -} - -/****************************************************************************/ -/* Tests for firmware space functions */ - -static void secdata_firmware_tests(void) -{ - /* Write with no new changes */ - reset_common_data(0, 0); - ctx->flags &= ~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED; - TEST_SUCC(secdata_firmware_write(ctx), - "secdata_firmware_write(), no changes, success"); - TEST_STR_EQ(mock_calls, - "", - " tlcl calls"); - - /* Write failure */ - reset_common_data(1, TPM_E_IOERROR); - TEST_EQ(secdata_firmware_write(ctx), TPM_E_IOERROR, - "secdata_firmware_write(), failure"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x1007, 10)\n", - " tlcl calls"); - TEST_NEQ(ctx->flags & VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED, 0, - " should leave SECDATA_FIRMWARE_CHANGED context flag"); - - /* Write in normal mode */ - reset_common_data(0, 0); - ctx->flags &= ~VB2_CONTEXT_RECOVERY_MODE; - TEST_EQ(secdata_firmware_write(ctx), TPM_E_AREA_LOCKED, - "secdata_firmware_write(), normal mode, failure"); - TEST_STR_EQ(mock_calls, - "", - " tlcl calls"); - TEST_NEQ(ctx->flags & VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED, 0, - " should leave SECDATA_FIRMWARE_CHANGED context flag"); - - /* Write success and readback */ - reset_common_data(0, 0); - memset(ctx->secdata_firmware, 0xaa, sizeof(ctx->secdata_firmware)); - TEST_SUCC(secdata_firmware_write(ctx), - "secdata_firmware_write(), success"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x1007, 10)\n", - " tlcl calls"); - memset(ctx->secdata_firmware, 0xaa, sizeof(ctx->secdata_firmware)); - TEST_EQ(memcmp(ctx->secdata_firmware, &mock_rsf, - sizeof(ctx->secdata_firmware)), 0, - " unchanged on readback"); - TEST_EQ(ctx->flags & VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED, 0, - " should reset SECDATA_FIRMWARE_CHANGED context flag"); -} - -/****************************************************************************/ -/* Tests for kernel space functions */ - -static void secdata_kernel_tests(void) -{ - /* Not present is an error */ - reset_common_data(1, TPM_E_BADINDEX); - TEST_EQ(secdata_kernel_read(ctx), TPM_E_BADINDEX, - "secdata_kernel_read(), not present"); - TEST_STR_EQ(mock_calls, -#ifndef TPM2_MODE - "TlclGetPermissions(0x1008)\n", -#else - "TlclRead(0x1008, 13)\n", -#endif - " tlcl calls"); - -#ifndef TPM2_MODE - /* Bad permissions */ - reset_common_data(0, 0); - mock_permissions = 0; - TEST_EQ(secdata_kernel_read(ctx), TPM_E_CORRUPTED_STATE, - "secdata_kernel_read(), bad permissions"); - TEST_STR_EQ(mock_calls, - "TlclGetPermissions(0x1008)\n", - " tlcl calls"); -#endif - - /* Good permissions, read failure */ -#ifndef TPM2_MODE - int read_failure_on_call = 2; -#else - int read_failure_on_call = 1; -#endif - reset_common_data(read_failure_on_call, TPM_E_IOERROR); - TEST_EQ(secdata_kernel_read(ctx), TPM_E_IOERROR, - "secdata_kernel_read(), good permissions, failure"); - TEST_STR_EQ(mock_calls, -#ifndef TPM2_MODE - "TlclGetPermissions(0x1008)\n" -#endif - "TlclRead(0x1008, 13)\n", - " tlcl calls"); - - /* Good permissions, read success, bad CRC */ - reset_common_data(0, 0); - mock_bad_crc = 1; - TEST_EQ(secdata_kernel_read(ctx), TPM_E_CORRUPTED_STATE, - "secdata_kernel_read(), read success, bad CRC"); - TEST_STR_EQ(mock_calls, -#ifndef TPM2_MODE - "TlclGetPermissions(0x1008)\n" -#endif - "TlclRead(0x1008, 13)\n", - " tlcl calls"); - - /* Good permissions, read success */ - reset_common_data(0, 0); - TEST_SUCC(secdata_kernel_read(ctx), - "secdata_kernel_read(), good permissions, success"); - TEST_STR_EQ(mock_calls, -#ifndef TPM2_MODE - "TlclGetPermissions(0x1008)\n" -#endif - "TlclRead(0x1008, 13)\n", - " tlcl calls"); - TEST_EQ(memcmp(ctx->secdata_kernel, &mock_rsk, - sizeof(ctx->secdata_kernel)), 0, " data"); - - /* Write with no new changes */ - reset_common_data(0, 0); - ctx->flags &= ~VB2_CONTEXT_SECDATA_KERNEL_CHANGED; - TEST_SUCC(secdata_kernel_write(ctx), - "secdata_kernel_write(), no changes, success"); - TEST_STR_EQ(mock_calls, - "", - " tlcl calls"); - - /* Write failure */ - reset_common_data(1, TPM_E_IOERROR); - TEST_EQ(secdata_kernel_write(ctx), TPM_E_IOERROR, - "secdata_kernel_write(), failure"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x1008, 13)\n", - " tlcl calls"); - TEST_NEQ(ctx->flags & VB2_CONTEXT_SECDATA_KERNEL_CHANGED, 0, - " should leave SECDATA_KERNEL_CHANGED context flag"); - - /* Write success and readback */ - reset_common_data(0, 0); - memset(ctx->secdata_kernel, 0xaa, sizeof(ctx->secdata_kernel)); - TEST_SUCC(secdata_kernel_write(ctx), - "secdata_kernel_write(), failure"); - TEST_STR_EQ(mock_calls, - "TlclWrite(0x1008, 13)\n", - " tlcl calls"); - memset(ctx->secdata_kernel, 0xaa, sizeof(ctx->secdata_kernel)); - TEST_EQ(memcmp(ctx->secdata_kernel, &mock_rsk, - sizeof(ctx->secdata_kernel)), 0, - " unchanged on readback"); - TEST_EQ(ctx->flags & VB2_CONTEXT_SECDATA_KERNEL_CHANGED, 0, - " should reset SECDATA_KERNEL_CHANGED context flag"); - - /* Lock in normal mode with failure */ - reset_common_data(1, TPM_E_AREA_LOCKED); - TEST_EQ(secdata_kernel_lock(ctx), TPM_E_AREA_LOCKED, - "secdata_kernel_lock(), lock failure"); - TEST_STR_EQ(mock_calls, - "TlclLockPhysicalPresence()\n", - " tlcl calls"); - - /* Lock in normal mode */ - reset_common_data(0, 0); - TEST_SUCC(secdata_kernel_lock(ctx), - "secdata_kernel_lock(), success (locked)"); - TEST_STR_EQ(mock_calls, - "TlclLockPhysicalPresence()\n", - " tlcl calls"); - - /* Lock after already locked (only one TlclLockPhysicalPresence). */ - reset_common_data(0, 0); - TEST_SUCC(secdata_kernel_lock(ctx), - "secdata_kernel_lock(), lock first run"); - TEST_SUCC(secdata_kernel_lock(ctx), - "secdata_kernel_lock(), already locked"); - TEST_STR_EQ(mock_calls, - "TlclLockPhysicalPresence()\n", - " tlcl calls"); -} - -/****************************************************************************/ -/* Tests for fwmp space functions */ - -static void secdata_fwmp_tests(void) -{ - /* Read failure */ - reset_common_data(1, TPM_E_IOERROR); - TEST_EQ(secdata_fwmp_read(ctx), TPM_E_IOERROR, - "secdata_fwmp_read(), failure"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n", - " tlcl calls"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); - - /* Normal read, bad CRC */ - reset_common_data(0, 0); - mock_bad_crc = 1; - TEST_EQ(secdata_fwmp_read(ctx), TPM_E_CORRUPTED_STATE, - "secdata_fwmp_read(), success, bad CRC"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n", - " tlcl calls"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); - - /* Normal read */ - reset_common_data(0, 0); - TEST_SUCC(secdata_fwmp_read(ctx), - "secdata_fwmp_read(), success"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n", - " tlcl calls"); - TEST_EQ(memcmp(ctx->secdata_fwmp, &mock_fwmp, - mock_fwmp_real_size), 0, " data"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); - - /* Read error */ - reset_common_data(1, TPM_E_IOERROR); - TEST_EQ(secdata_fwmp_read(ctx), TPM_E_IOERROR, - "secdata_fwmp_read(), error"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n", - " tlcl calls"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); - - /* Not present isn't an error; just sets context flag */ - reset_common_data(1, TPM_E_BADINDEX); - TEST_SUCC(secdata_fwmp_read(ctx), "secdata_fwmp_read(), not present"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n", - " tlcl calls"); - TEST_NEQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should set NO_SECDATA_FWMP context flag"); - - /* Struct size too large, then bad CRC */ - reset_common_data(0, 0); - mock_fwmp_real_size += 4; - mock_bad_crc = 1; - TEST_EQ(secdata_fwmp_read(ctx), TPM_E_CORRUPTED_STATE, - "secdata_fwmp_read(), bigger, bad CRC"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n" - "TlclRead(0x100a, 44)\n", - " tlcl calls"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); - - /* Struct size too large */ - reset_common_data(0, 0); - mock_fwmp_real_size += 4; - TEST_SUCC(secdata_fwmp_read(ctx), "secdata_fwmp_read(), bigger"); - TEST_STR_EQ(mock_calls, - "TlclRead(0x100a, 40)\n" - "TlclRead(0x100a, 44)\n", - " tlcl calls"); - TEST_EQ(memcmp(ctx->secdata_fwmp, &mock_fwmp, - mock_fwmp_real_size), 0, " data"); - TEST_EQ(ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP, 0, - " should leave NO_SECDATA_FWMP context flag"); -} - -int main(int argc, char* argv[]) -{ - misc_tests(); - secdata_firmware_tests(); - secdata_kernel_tests(); - secdata_fwmp_tests(); - - return gTestSuccess ? 0 : 255; -} diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index 48cb206a..622b3030 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -15,7 +15,6 @@ #include "2sysincludes.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "vboot_audio.h" #include "vboot_display.h" diff --git a/tests/vb2_ec_sync_tests.c b/tests/vb2_ec_sync_tests.c index 085cefba..a4449308 100644 --- a/tests/vb2_ec_sync_tests.c +++ b/tests/vb2_ec_sync_tests.c @@ -11,7 +11,6 @@ #include "2sysincludes.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "vboot_audio.h" #include "vboot_display.h" diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c index a26b9f67..3706dbe7 100644 --- a/tests/vboot_api_devmode_tests.c +++ b/tests/vboot_api_devmode_tests.c @@ -18,7 +18,6 @@ #include "crc32.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "vboot_display.h" #include "vboot_kernel.h" diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 81db3958..14843fe1 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -12,7 +12,6 @@ #include "2secdata_struct.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "tss_constants.h" #include "vboot_audio.h" @@ -133,11 +132,6 @@ static void ResetMocks(void) /* Mock functions */ -uint32_t secdata_kernel_lock(struct vb2_context *c) -{ - return TPM_SUCCESS; -} - struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c) { return &gbb; diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index d413024e..cbae595c 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -13,7 +13,6 @@ #include "2sysincludes.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "tlcl.h" #include "tss_constants.h" @@ -34,17 +33,15 @@ static struct vb2_gbb_header gbb; static uint32_t kernel_version; static uint32_t new_version; -static uint8_t fwmp_buf[VB2_SECDATA_FWMP_MIN_SIZE]; -static uint32_t kernel_read_retval; -static uint32_t kernel_write_retval; -static uint32_t kernel_lock_retval; -static uint32_t fwmp_read_retval; static vb2_error_t vbboot_retval; +static vb2_error_t commit_data_retval; +static int commit_data_called; +static vb2_error_t secdata_kernel_init_retval; +static vb2_error_t secdata_fwmp_init_retval; static uint32_t mock_switches[8]; static uint32_t mock_switches_count; static int mock_switches_are_stuck; -static int commit_data_called; /* Reset mock data (for use before each test) */ static void ResetMocks(void) @@ -68,14 +65,11 @@ static void ResetMocks(void) memset(&shared_data, 0, sizeof(shared_data)); - memset(&fwmp_buf, 0, sizeof(fwmp_buf)); - fwmp_read_retval = TPM_SUCCESS; - kernel_version = new_version = 0x10002; - kernel_read_retval = TPM_SUCCESS; - kernel_write_retval = TPM_SUCCESS; - kernel_lock_retval = TPM_SUCCESS; + commit_data_retval = VB2_SUCCESS; vbboot_retval = VB2_SUCCESS; + secdata_kernel_init_retval = VB2_SUCCESS; + secdata_fwmp_init_retval = VB2_SUCCESS; memset(mock_switches, 0, sizeof(mock_switches)); mock_switches_count = 0; @@ -87,43 +81,12 @@ static void ResetMocks(void) vb2_error_t vb2ex_commit_data(struct vb2_context *c) { commit_data_called = 1; - return VB2_SUCCESS; -} - -uint32_t secdata_firmware_write(struct vb2_context *c) -{ - return TPM_SUCCESS; -} - -uint32_t secdata_kernel_read(struct vb2_context *c) -{ - return kernel_read_retval; -} - -uint32_t secdata_kernel_write(struct vb2_context *c) -{ - return kernel_write_retval; -} - -uint32_t secdata_kernel_lock(struct vb2_context *c) -{ - return kernel_lock_retval; -} - -uint32_t secdata_fwmp_read(struct vb2_context *c) -{ - memcpy(&c->secdata_fwmp, &fwmp_buf, sizeof(fwmp_buf)); - return fwmp_read_retval; -} - -vb2_error_t vb2_secdata_firmware_init(struct vb2_context *c) -{ - return VB2_SUCCESS; + return commit_data_retval; } vb2_error_t vb2_secdata_kernel_init(struct vb2_context *c) { - return VB2_SUCCESS; + return secdata_kernel_init_retval; } uint32_t vb2_secdata_kernel_get(struct vb2_context *c, @@ -132,6 +95,11 @@ uint32_t vb2_secdata_kernel_get(struct vb2_context *c, return kernel_version; } +vb2_error_t vb2_secdata_fwmp_init(struct vb2_context *c) +{ + return secdata_fwmp_init_retval; +} + void vb2_secdata_kernel_set(struct vb2_context *c, enum vb2_secdata_kernel_param param, uint32_t value) @@ -222,12 +190,6 @@ static void VbSlkTest(void) gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC; test_slk(0, 0, "EC sync disabled by GBB"); - /* Rollback kernel version */ - ResetMocks(); - kernel_read_retval = 123; - test_slk(VB2_ERROR_SECDATA_KERNEL_READ, - VB2_RECOVERY_RW_TPM_R_ERROR, "Read kernel rollback"); - ResetMocks(); new_version = 0x20003; test_slk(0, 0, "Roll forward"); @@ -254,15 +216,10 @@ static void VbSlkTest(void) ResetMocks(); new_version = 0x20003; - kernel_write_retval = 123; + commit_data_retval = VB2_ERROR_SECDATA_KERNEL_WRITE; test_slk(VB2_ERROR_SECDATA_KERNEL_WRITE, VB2_RECOVERY_RW_TPM_W_ERROR, "Write kernel rollback"); - ResetMocks(); - kernel_lock_retval = 123; - test_slk(VB2_ERROR_SECDATA_KERNEL_LOCK, - VB2_RECOVERY_RW_TPM_L_ERROR, "Lock kernel rollback"); - /* Boot normal */ ResetMocks(); vbboot_retval = -1; @@ -282,6 +239,32 @@ static void VbSlkTest(void) " didn't commit nvdata"); } + /* Boot normal - secdata init failures */ + ResetMocks(); + secdata_kernel_init_retval = VB2_ERROR_UNKNOWN; + test_slk(secdata_kernel_init_retval, VB2_RECOVERY_SECDATA_KERNEL_INIT, + "Normal secdata_kernel init error triggers recovery"); + + ResetMocks(); + secdata_fwmp_init_retval = VB2_ERROR_UNKNOWN; + test_slk(secdata_fwmp_init_retval, VB2_RECOVERY_SECDATA_FWMP_INIT, + "Normal secdata_fwmp init error triggers recovery"); + + /* Boot normal - commit data failures */ + ResetMocks(); + commit_data_retval = VB2_ERROR_SECDATA_FIRMWARE_WRITE; + test_slk(commit_data_retval, VB2_RECOVERY_RW_TPM_W_ERROR, + "Normal secdata_firmware write error triggers recovery"); + commit_data_retval = VB2_ERROR_SECDATA_KERNEL_WRITE; + test_slk(commit_data_retval, VB2_RECOVERY_RW_TPM_W_ERROR, + "Normal secdata_kernel write error triggers recovery"); + commit_data_retval = VB2_ERROR_NV_WRITE; + TEST_ABORT(VbSelectAndLoadKernel(ctx, shared, &kparams), + "Normal nvdata write error aborts"); + commit_data_retval = VB2_ERROR_UNKNOWN; + TEST_ABORT(VbSelectAndLoadKernel(ctx, shared, &kparams), + "Normal unknown commit error aborts"); + /* Boot dev */ ResetMocks(); sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; @@ -306,12 +289,17 @@ static void VbSlkTest(void) test_slk(0, 0, "Recovery doesn't roll forward"); TEST_EQ(kernel_version, 0x10002, " version"); + /* Boot recovery - commit data failures */ ResetMocks(); sd->recovery_reason = 123; - kernel_read_retval = TPM_E_IOERROR; - kernel_write_retval = TPM_E_IOERROR; - kernel_lock_retval = TPM_E_IOERROR; - test_slk(0, 0, "Recovery ignore TPM errors"); + commit_data_retval = VB2_ERROR_SECDATA_FIRMWARE_WRITE; + test_slk(0, 0, "Recovery ignore secdata_firmware write error"); + commit_data_retval = VB2_ERROR_SECDATA_KERNEL_WRITE; + test_slk(0, 0, "Recovery ignore secdata_kernel write error"); + commit_data_retval = VB2_ERROR_NV_WRITE; + test_slk(0, 0, "Recovery return nvdata write error"); + commit_data_retval = VB2_ERROR_UNKNOWN; + test_slk(0, 0, "Recovery return unknown write error"); ResetMocks(); sd->recovery_reason = VB2_RECOVERY_TRAIN_AND_REBOOT; diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index 61077227..d7c32357 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -10,7 +10,6 @@ #include "2nvstorage.h" #include "2sysincludes.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "utility.h" #include "vboot_api.h" diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index 41c89dd5..8f839e9d 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -12,7 +12,6 @@ #include "2secdata_struct.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "tss_constants.h" #include "vboot_api.h" @@ -126,11 +125,6 @@ static void ResetMocksForManualRecovery(void) /* Mock functions */ -uint32_t secdata_kernel_lock(struct vb2_context *c) -{ - return TPM_SUCCESS; -} - struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c) { return &gbb; diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c index 2fa5ac97..970025b9 100644 --- a/tests/vboot_display_tests.c +++ b/tests/vboot_display_tests.c @@ -16,7 +16,6 @@ #include "2struct.h" #include "2sysincludes.h" #include "host_common.h" -#include "secdata_tpm.h" #include "test_common.h" #include "vboot_display.h" #include "vboot_kernel.h" diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 9063aeb6..fd0ccfd1 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -19,7 +19,6 @@ #include "gpt.h" #include "host_common.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "test_common.h" #include "vb2_common.h" #include "vboot_api.h" |