diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/include/vboot_nvstorage.h | 2 | ||||
-rw-r--r-- | firmware/include/vboot_struct.h | 1 | ||||
-rw-r--r-- | firmware/lib/vboot_api_kernel.c | 3 | ||||
-rw-r--r-- | firmware/lib/vboot_display.c | 5 | ||||
-rw-r--r-- | firmware/lib/vboot_kernel.c | 24 | ||||
-rw-r--r-- | firmware/lib/vboot_nvstorage.c | 12 |
6 files changed, 39 insertions, 8 deletions
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h index f010ddcc..28a1a62a 100644 --- a/firmware/include/vboot_nvstorage.h +++ b/firmware/include/vboot_nvstorage.h @@ -54,6 +54,8 @@ typedef enum VbNvParam { VBNV_TEST_ERROR_NUM, /* Allow booting from USB in developer mode. 0=no, 1=yes. */ VBNV_DEV_BOOT_USB, + /* Allow booting self-signed images in developer mode. 0=no, 1=yes. */ + VBNV_DEV_BOOT_CUSTOM, } VbNvParam; diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 795523ed..3374d4cc 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -234,6 +234,7 @@ typedef struct VbKernelPreambleHeader { #define VBSD_LKP_CHECK_PREAMBLE_VALID 11 #define VBSD_LKP_CHECK_BODY_ADDRESS 12 #define VBSD_LKP_CHECK_BODY_OFFSET 13 +#define VBSD_LKP_CHECK_SELF_SIGNED 14 #define VBSD_LKP_CHECK_BODY_EXCEEDS_MEM 15 #define VBSD_LKP_CHECK_BODY_EXCEEDS_PART 16 #define VBSD_LKP_CHECK_READ_DATA 17 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index a8368603..76ab9ae0 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -97,10 +97,11 @@ uint32_t VbTryLoadKernel(VbCommonParams* cparams, LoadKernelParams* p, /* Handle a normal boot. */ VbError_t VbBootNormal(VbCommonParams* cparams, LoadKernelParams* p) { - /* Force dev_boot_usb flag disabled. This ensures the flag will be + /* Force dev_boot_* flags disabled. This ensures they will be * initially disabled if the user later transitions back into * developer mode. */ VbNvSet(&vnc, VBNV_DEV_BOOT_USB, 0); + VbNvSet(&vnc, VBNV_DEV_BOOT_CUSTOM, 0); /* Boot from fixed disk only */ return VbTryLoadKernel(cparams, p, VB_DISK_FLAG_FIXED); diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index c0df16b2..a721b3d5 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -521,6 +521,11 @@ VbError_t VbDisplayDebugInfo(VbCommonParams* cparams, VbNvContext *vncptr) { used += Strncat(buf + used, "\ndev_boot_usb: ", DEBUG_INFO_SIZE - used); used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, i, 10, 0); + /* Add dev_boot_custom flag */ + VbNvGet(vncptr, VBNV_DEV_BOOT_CUSTOM, &i); + used += Strncat(buf + used, "\ndev_boot_custom: ", DEBUG_INFO_SIZE - used); + used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, i, 10, 0); + /* Add TPM versions */ used += Strncat(buf + used, "\nTPM: fwver=0x", DEBUG_INFO_SIZE - used); used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index e38c4704..83c5eca2 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -121,6 +121,7 @@ int WriteAndFreeGptData(VbExDiskHandle_t disk_handle, GptData* gptdata) { /* disable MSVC warning on const logical expression (as in } while(0);) */ __pragma(warning(disable: 4127)) + VbError_t LoadKernel(LoadKernelParams* params) { VbSharedDataHeader* shared = (VbSharedDataHeader*)params->shared_data_blob; VbSharedDataKernelCall* shcall = NULL; @@ -139,6 +140,7 @@ VbError_t LoadKernel(LoadKernelParams* params) { int rec_switch, dev_switch; BootMode boot_mode; uint32_t test_err = 0; + uint32_t allow_self_signed = 0; VbError_t retval = VBERROR_UNKNOWN; int recovery = VBNV_RECOVERY_RO_UNSPECIFIED; @@ -162,12 +164,14 @@ VbError_t LoadKernel(LoadKernelParams* params) { /* Calculate switch positions and boot mode */ rec_switch = (BOOT_FLAG_RECOVERY & params->boot_flags ? 1 : 0); dev_switch = (BOOT_FLAG_DEVELOPER & params->boot_flags ? 1 : 0); - if (rec_switch) + if (rec_switch) { boot_mode = kBootRecovery; - else if (dev_switch) + } else if (dev_switch) { boot_mode = kBootDev; - else + VbNvGet(vnc, VBNV_DEV_BOOT_CUSTOM, &allow_self_signed); + } else { boot_mode = kBootNormal; + } /* Set up tracking for this call. This wraps around if called many times, * so we need to initialize the call entry each time. */ @@ -250,7 +254,7 @@ VbError_t LoadKernel(LoadKernelParams* params) { int key_block_valid = 1; VBDEBUG(("Found kernel entry at %" PRIu64 " size %" PRIu64 "\n", - part_start, part_size)); + part_start, part_size)); /* Set up tracking for this partition. This wraps around if called * many times, so initialize the partition entry each time. */ @@ -293,8 +297,14 @@ VbError_t LoadKernel(LoadKernelParams* params) { if (kBootDev != boot_mode) goto bad_kernel; - /* In developer mode, we can continue if the SHA-512 hash of the key - * block is valid. */ + /* In developer mode, we have to explictly allow self-signed kernels */ + if (!allow_self_signed) { + VBDEBUG(("Self-signed custom kernels are not enabled.\n")); + shpart->check_result = VBSD_LKP_CHECK_SELF_SIGNED; + goto bad_kernel; + } + + /* Allow the kernel if the SHA-512 hash of the key block is valid. */ if (0 != KeyBlockVerify(key_block, KBUF_SIZE, kernel_subkey, 1)) { VBDEBUG(("Verifying key block hash failed.\n")); shpart->check_result = VBSD_LKP_CHECK_KEY_BLOCK_HASH; @@ -489,7 +499,7 @@ VbError_t LoadKernel(LoadKernelParams* params) { /* Continue, so that we skip the error handling code below */ continue; - bad_kernel: + bad_kernel: /* Handle errors parsing this kernel */ if (NULL != data_key) RSAPublicKeyFree(data_key); diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c index 86fafb04..75910ed0 100644 --- a/firmware/lib/vboot_nvstorage.c +++ b/firmware/lib/vboot_nvstorage.c @@ -28,6 +28,7 @@ #define DEV_FLAGS_OFFSET 4 #define DEV_BOOT_USB_MASK 0x01 +#define DEV_BOOT_CUSTOM_MASK 0x02 #define FIRMWARE_FLAGS_OFFSET 5 #define FIRMWARE_TEST_ERR_FUNC_MASK 0x38 @@ -142,6 +143,10 @@ int VbNvGet(VbNvContext* context, VbNvParam param, uint32_t* dest) { *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_USB_MASK ? 1 : 0); return 0; + case VBNV_DEV_BOOT_CUSTOM: + *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_CUSTOM_MASK ? 1 : 0); + return 0; + default: return 1; } @@ -227,6 +232,13 @@ int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) { raw[DEV_FLAGS_OFFSET] &= ~DEV_BOOT_USB_MASK; break; + case VBNV_DEV_BOOT_CUSTOM: + if (value) + raw[DEV_FLAGS_OFFSET] |= DEV_BOOT_CUSTOM_MASK; + else + raw[DEV_FLAGS_OFFSET] &= ~DEV_BOOT_CUSTOM_MASK; + break; + default: return 1; } |