vboot: check VBmeta algorithm in verify_avb_data Verify that a single VBmeta image is present and that its header algorithm matches the kernel key algorithm in verify_avb_data(). BRANCH=none BUG=b:524136356 TEST=Build and unit test, boot on DUT Change-Id: I3bdb0f8419528b22028befd6bed1406232e9fe97 Signed-off-by: Grzegorz Bernacki <bernacki@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/8705573 Reviewed-by: Konrad Adamczyk <konrada@google.com>
diff --git a/firmware/2lib/2load_android_kernel.c b/firmware/2lib/2load_android_kernel.c index a6193b6..aba608a 100644 --- a/firmware/2lib/2load_android_kernel.c +++ b/firmware/2lib/2load_android_kernel.c
@@ -430,7 +430,28 @@ return false; } -static vb2_error_t verify_avb_data(const AvbSlotVerifyData *verify_data, +static AvbAlgorithmType vb2_to_avb_algorithm(enum vb2_crypto_algorithm vb2_alg) +{ + switch (vb2_alg) { + case VB2_ALG_RSA2048_SHA256: + return AVB_ALGORITHM_TYPE_SHA256_RSA2048; + case VB2_ALG_RSA2048_SHA512: + return AVB_ALGORITHM_TYPE_SHA512_RSA2048; + case VB2_ALG_RSA4096_SHA256: + return AVB_ALGORITHM_TYPE_SHA256_RSA4096; + case VB2_ALG_RSA4096_SHA512: + return AVB_ALGORITHM_TYPE_SHA512_RSA4096; + case VB2_ALG_RSA8192_SHA256: + return AVB_ALGORITHM_TYPE_SHA256_RSA8192; + case VB2_ALG_RSA8192_SHA512: + return AVB_ALGORITHM_TYPE_SHA512_RSA8192; + default: + return AVB_ALGORITHM_TYPE_NONE; + } +} + +static vb2_error_t verify_avb_data(struct vb2_context *ctx, + const AvbSlotVerifyData *verify_data, AvbOps *avb_ops, const char *expected_slot_suffix, const char **requested_partitions, @@ -525,15 +546,38 @@ if (!need_verification) goto out; - /* Verify vbmeta images if verification is needed */ - for (size_t i = 0; i < verify_data->num_vbmeta_images; i++) { - const AvbVBMetaData *vbmeta = &verify_data->vbmeta_images[i]; - if (vbmeta->verify_result != AVB_VBMETA_VERIFY_RESULT_OK) { - VB2_DEBUG("ERROR: VBMeta image %s verification failed: %d\n", - vbmeta->partition_name ? vbmeta->partition_name : "(null)", - vbmeta->verify_result); - return VB2_ERROR_AVB_ERROR_VERIFICATION; - } + if (verify_data->num_vbmeta_images != 1) { + VB2_DEBUG("ERROR: Unexpected number of VBMeta images: %zu\n", + verify_data->num_vbmeta_images); + return VB2_ERROR_AVB_ERROR_VERIFICATION; + } + + const AvbVBMetaData *vbmeta = &verify_data->vbmeta_images[0]; + if (vbmeta->verify_result != AVB_VBMETA_VERIFY_RESULT_OK) { + VB2_DEBUG("ERROR: VBMeta image %s verification failed: %d\n", + vbmeta->partition_name ? vbmeta->partition_name : "(null)", + vbmeta->verify_result); + return VB2_ERROR_AVB_ERROR_VERIFICATION; + } + + struct vb2_shared_data *sd = vb2_get_sd(ctx); + const struct vb2_packed_key *packed_key = vb2_member_of(sd, sd->kernel_key_offset); + AvbAlgorithmType expected_alg = vb2_to_avb_algorithm(packed_key->algorithm); + + if (!vbmeta->vbmeta_data || + vbmeta->vbmeta_size < sizeof(AvbVBMetaImageHeader)) { + VB2_DEBUG("ERROR: Invalid VBMeta header\n"); + return VB2_ERROR_AVB_ERROR_VERIFICATION; + } + + const AvbVBMetaImageHeader *vbmeta_hdr = + (const AvbVBMetaImageHeader *)vbmeta->vbmeta_data; + uint32_t vbmeta_alg = be32toh(vbmeta_hdr->algorithm_type); + if (expected_alg == AVB_ALGORITHM_TYPE_NONE || + vbmeta_alg != expected_alg) { + VB2_DEBUG("ERROR: VBMeta algorithm mismatch: got %u, expected %u\n", + vbmeta_alg, expected_alg); + return VB2_ERROR_AVB_ERROR_VERIFICATION; } out: @@ -643,7 +687,7 @@ print_avb_slot_verify_data(verify_data); - rv = verify_avb_data(verify_data, avb_ops, slot_suffix, boot_partitions, + rv = verify_avb_data(ctx, verify_data, avb_ops, slot_suffix, boot_partitions, need_verification); if (rv != VB2_SUCCESS) goto out;
diff --git a/tests/vb2_load_android_tests.c b/tests/vb2_load_android_tests.c index 4bce6d5..05e07b7 100644 --- a/tests/vb2_load_android_tests.c +++ b/tests/vb2_load_android_tests.c
@@ -41,6 +41,9 @@ GptEntry entries[NUM_OF_ENTRIES]; struct vendor_boot_img_hdr_v4 vendor_boot_hdr; struct boot_img_hdr_v4 init_boot_hdr; +AvbVBMetaImageHeader vbmeta_hdr; +AvbVBMetaData vbmeta_image; +size_t num_vbmeta_images; enum avb_fail {NO_FAIL, VERIFY_FAIL, ROLLBACK_FAIL}; @@ -123,6 +126,8 @@ verify_data->cmdline = (char *)""; verify_data->ab_suffix = strdup(ab_suffix); verify_data->loaded_partitions = calloc(num_loaded, sizeof(AvbPartitionData)); + verify_data->num_vbmeta_images = num_vbmeta_images; + verify_data->vbmeta_images = &vbmeta_image; size_t idx = 0; for (size_t i = 0; requested_partitions[i] != NULL; i++) { @@ -225,12 +230,25 @@ /* Reset mock data (for use before each test) */ static void reset_mocks(void) { + struct vb2_packed_key *packed_key; + rollback_value = 0x1; avb_verification_fails = NO_FAIL; init_boot_missing = false; vendor_boot_missing = false; ota_recovery_sector = OTA_RECOVERY_A_PART; + memset(&vbmeta_hdr, 0, sizeof(vbmeta_hdr)); + memcpy(vbmeta_hdr.magic, AVB_MAGIC, AVB_MAGIC_LEN); + vbmeta_hdr.algorithm_type = htobe32(AVB_ALGORITHM_TYPE_SHA256_RSA2048); + + memset(&vbmeta_image, 0, sizeof(vbmeta_image)); + vbmeta_image.partition_name = (char *)"vbmeta"; + vbmeta_image.vbmeta_data = (uint8_t *)&vbmeta_hdr; + vbmeta_image.vbmeta_size = sizeof(vbmeta_hdr); + vbmeta_image.verify_result = AVB_VBMETA_VERIFY_RESULT_OK; + num_vbmeta_images = 1; + memset(&gbb, 0, sizeof(gbb)); gbb.major_version = VB2_GBB_MAJOR_VER; gbb.minor_version = VB2_GBB_MINOR_VER; @@ -287,6 +305,11 @@ sd = vb2_get_sd(ctx); sd->status |= VB2_SD_STATUS_SECDATA_FWMP_INIT; + sd->kernel_key_offset = sd->workbuf_used; + sd->kernel_key_size = sizeof(*packed_key); + vb2_set_workbuf_used(ctx, sd->kernel_key_offset + sd->kernel_key_size); + packed_key = vb2_member_of(sd, sd->kernel_key_offset); + packed_key->algorithm = VB2_ALG_RSA2048_SHA256; SET_BOOT_MODE(ctx, VB2_BOOT_MODE_NORMAL); } @@ -373,6 +396,18 @@ vendor_boot_hdr.vendor_ramdisk_size = 16384; TEST_EQ(vb2api_load_kernel(ctx, &lkp, &disk_info), VB2_ERROR_LK_INVALID_KERNEL_FOUND, "vendor_boot ramdisk table too big"); + + // Unexpected number of VBMeta images + reset_mocks(); + num_vbmeta_images = 2; + TEST_EQ(vb2api_load_kernel(ctx, &lkp, &disk_info), VB2_ERROR_LK_INVALID_KERNEL_FOUND, + "Unexpected number of VBMeta images"); + + // VBMeta algorithm mismatch + reset_mocks(); + vbmeta_hdr.algorithm_type = htobe32(AVB_ALGORITHM_TYPE_SHA256_RSA4096); + TEST_EQ(vb2api_load_kernel(ctx, &lkp, &disk_info), VB2_ERROR_LK_INVALID_KERNEL_FOUND, + "VBMeta algorithm mismatch"); } static void load_ota_recovery_tests(void)