From fdabf3fcd792e5939445233c74eb8bf3bb73de39 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 6 May 2020 17:06:35 -0700 Subject: cbfs: Add verification for RO CBFS metadata hash This patch adds the first stage of the new CONFIG_CBFS_VERIFICATION feature. It's not useful to end-users in this stage so it cannot be selected in menuconfig (and should not be used other than for development) yet. With this patch coreboot can verify the metadata hash of the RO CBFS when it starts booting, but it does not verify individual files yet. Likewise, verifying RW CBFSes with vboot is not yet supported. Verification is bootstrapped from a "metadata hash anchor" structure that is embedded in the bootblock code and marked by a unique magic number. This anchor contains both the CBFS metadata hash and a separate hash for the FMAP which is required to find the primary CBFS. Both are verified on first use in the bootblock (and halt the system on failure). The CONFIG_TOCTOU_SAFETY option is also added for illustrative purposes to show some paths that need to be different when full protection against TOCTOU (time-of-check vs. time-of-use) attacks is desired. For normal verification it is sufficient to check the FMAP and the CBFS metadata hash only once in the bootblock -- for TOCTOU verification we do the same, but we need to be extra careful that we do not re-read the FMAP or any CBFS metadata in later stages. This is mostly achieved by depending on the CBFS metadata cache and FMAP cache features, but we allow for one edge case in case the RW CBFS metadata cache overflows (which may happen during an RW update and could otherwise no longer be fixed because mcache size is defined by RO code). This code is added to demonstrate design intent but won't really matter until RW CBFS verification can be supported. Signed-off-by: Julius Werner Change-Id: I8930434de55eb938b042fdada9aa90218c0b5a34 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41120 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/cbfstool/cbfs.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util') diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 9b4d7ae316..7f07751a8f 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -11,6 +11,11 @@ #define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC +/* cbfstool is allowed to use this constant freely since it's not part of the + CBFS image, so make an alias for the name that's a little less aggressive. */ +#define METADATA_HASH_ANCHOR_MAGIC \ + DO_NOT_USE_METADATA_HASH_ANCHOR_MAGIC_DO_NOT_USE + struct typedesc_t { uint32_t type; const char *name; -- cgit v1.2.3