vboot: update vboot2 functions to use new vb2_error_t

To make explicit when vboot2 error codes should be returned,
use the new vb2_error_t type on all functions which return
VB2_ERROR_* constants.

Additionally, add required vboot submodule commit id e6700f4c:
    2019-07-31 14:12:30 +0800 - (vboot: update vboot2 functions to use new vb2_error_t)

NOTE: This patch was merged separately on the Chromium tree:
https://chromium-review.googlesource.com/c/1728499

BUG=b:124141368, chromium:988410
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: I804c2b407e496d0c8eb9833be629b7c40118415c
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728292
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34860
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Joel Kitching 2019-07-31 14:19:00 +08:00 committed by Patrick Georgi
parent 057d1b9d7e
commit 220ac049ba
7 changed files with 35 additions and 30 deletions

2
3rdparty/vboot vendored

@ -1 +1 @@
Subproject commit a5afd01feb0b4b45adbcd8ab38ab8a2ef2a2ef67 Subproject commit e6700f4c70fe72850ae4f3f5df19c9281ebcefc8

View File

@ -38,38 +38,39 @@
#include "antirollback.h" #include "antirollback.h"
int vb2ex_tpm_clear_owner(struct vb2_context *ctx) vb2_error_t vb2ex_tpm_clear_owner(struct vb2_context *ctx)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_read_space_firmware(struct vb2_context *ctx) vb2_error_t antirollback_read_space_firmware(struct vb2_context *ctx)
{ {
vb2api_secdata_create(ctx); vb2api_secdata_create(ctx);
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_write_space_firmware(struct vb2_context *ctx) vb2_error_t antirollback_write_space_firmware(struct vb2_context *ctx)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_lock_space_firmware(void) vb2_error_t antirollback_lock_space_firmware(void)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_lock_space_rec_hash(void) vb2_error_t antirollback_lock_space_rec_hash(void)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_read_space_rec_hash(uint8_t *data, uint32_t size) vb2_error_t antirollback_read_space_rec_hash(uint8_t *data, uint32_t size)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }
uint32_t antirollback_write_space_rec_hash(const uint8_t *data, uint32_t size) vb2_error_t antirollback_write_space_rec_hash(const uint8_t *data,
uint32_t size)
{ {
return VB2_SUCCESS; return VB2_SUCCESS;
} }

View File

@ -474,7 +474,7 @@ uint32_t antirollback_write_space_rec_hash(const uint8_t *data, uint32_t size)
return write_secdata(REC_HASH_NV_INDEX, data, size); return write_secdata(REC_HASH_NV_INDEX, data, size);
} }
int vb2ex_tpm_clear_owner(struct vb2_context *ctx) vb2_error_t vb2ex_tpm_clear_owner(struct vb2_context *ctx)
{ {
uint32_t rv; uint32_t rv;
printk(BIOS_INFO, "Clearing TPM owner\n"); printk(BIOS_INFO, "Clearing TPM owner\n");

View File

@ -30,12 +30,12 @@ uint32_t vboot_setup_tpm(struct vb2_context *ctx)
return result; return result;
} }
uint32_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr,
enum vb2_pcr_digest which_digest) enum vb2_pcr_digest which_digest)
{ {
uint8_t buffer[VB2_PCR_DIGEST_RECOMMENDED_SIZE]; uint8_t buffer[VB2_PCR_DIGEST_RECOMMENDED_SIZE];
uint32_t size = sizeof(buffer); uint32_t size = sizeof(buffer);
int rv; vb2_error_t rv;
rv = vb2api_get_pcr_digest(ctx, which_digest, buffer, &size); rv = vb2api_get_pcr_digest(ctx, which_digest, buffer, &size);
if (rv != VB2_SUCCESS) if (rv != VB2_SUCCESS)

View File

@ -17,7 +17,7 @@
uint32_t vboot_setup_tpm(struct vb2_context *ctx); uint32_t vboot_setup_tpm(struct vb2_context *ctx);
/* vboot_extend_pcr function for vb2 context */ /* vboot_extend_pcr function for vb2 context */
uint32_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr,
enum vb2_pcr_digest which_digest); enum vb2_pcr_digest which_digest);
#else #else

View File

@ -55,7 +55,7 @@ void vb2ex_printf(const char *func, const char *fmt, ...)
return; return;
} }
int vb2ex_read_resource(struct vb2_context *ctx, vb2_error_t vb2ex_read_resource(struct vb2_context *ctx,
enum vb2_resource_index index, enum vb2_resource_index index,
uint32_t offset, uint32_t offset,
void *buf, void *buf,
@ -88,19 +88,21 @@ int vb2ex_read_resource(struct vb2_context *ctx,
} }
/* No-op stubs that can be overridden by SoCs with hardware crypto support. */ /* No-op stubs that can be overridden by SoCs with hardware crypto support. */
__weak int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, __weak vb2_error_t vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg,
uint32_t data_size) uint32_t data_size)
{ {
return VB2_ERROR_EX_HWCRYPTO_UNSUPPORTED; return VB2_ERROR_EX_HWCRYPTO_UNSUPPORTED;
} }
__weak int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size) __weak vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf,
uint32_t size)
{ {
BUG(); /* Should never get called if init() returned an error. */ BUG(); /* Should never get called if init() returned an error. */
return VB2_ERROR_UNKNOWN; return VB2_ERROR_UNKNOWN;
} }
__weak int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size) __weak vb2_error_t vb2ex_hwcrypto_digest_finalize(uint8_t *digest,
uint32_t digest_size)
{ {
BUG(); /* Should never get called if init() returned an error. */ BUG(); /* Should never get called if init() returned an error. */
return VB2_ERROR_UNKNOWN; return VB2_ERROR_UNKNOWN;
@ -169,7 +171,8 @@ static int handle_digest_result(void *slot_hash, size_t slot_hash_sz)
return 0; return 0;
} }
static int hash_body(struct vb2_context *ctx, struct region_device *fw_main) static vb2_error_t hash_body(struct vb2_context *ctx,
struct region_device *fw_main)
{ {
uint64_t load_ts; uint64_t load_ts;
uint32_t expected_size; uint32_t expected_size;
@ -178,7 +181,7 @@ static int hash_body(struct vb2_context *ctx, struct region_device *fw_main)
const size_t hash_digest_sz = sizeof(hash_digest); const size_t hash_digest_sz = sizeof(hash_digest);
size_t block_size = sizeof(block); size_t block_size = sizeof(block);
size_t offset; size_t offset;
int rv; vb2_error_t rv;
/* Clear the full digest so that any hash digests less than the /* Clear the full digest so that any hash digests less than the
* max have trailing zeros. */ * max have trailing zeros. */
@ -313,7 +316,7 @@ void verstage_main(void)
{ {
struct vb2_context ctx; struct vb2_context ctx;
struct region_device fw_main; struct region_device fw_main;
int rv; vb2_error_t rv;
timestamp_add_now(TS_START_VBOOT); timestamp_add_now(TS_START_VBOOT);

View File

@ -68,7 +68,7 @@ struct rk3288_crypto {
} *crypto = (void *)CRYPTO_BASE; } *crypto = (void *)CRYPTO_BASE;
check_member(rk3288_crypto, trng_dout[7], 0x220); check_member(rk3288_crypto, trng_dout[7], 0x220);
int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, vb2_error_t vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg,
uint32_t data_size) uint32_t data_size)
{ {
if (hash_alg != VB2_HASH_SHA256) { if (hash_alg != VB2_HASH_SHA256) {
@ -94,7 +94,7 @@ int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg,
return VB2_SUCCESS; return VB2_SUCCESS;
} }
int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size) vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size)
{ {
uint32_t intsts; uint32_t intsts;
@ -115,7 +115,8 @@ int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size)
return VB2_SUCCESS; return VB2_SUCCESS;
} }
int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size) vb2_error_t vb2ex_hwcrypto_digest_finalize(uint8_t *digest,
uint32_t digest_size)
{ {
uint32_t *dest = (uint32_t *)digest; uint32_t *dest = (uint32_t *)digest;
uint32_t *src = crypto->hash_dout; uint32_t *src = crypto->hash_dout;