image: add a stage pre-load
Subsystems (2)
v2 cover image: add a stage pre-load
This serie adds a stage pre-load before launching an image. This stage is used to read a header before the image and this header contains the signature of the full image. So u-boot may check the full image before using any data of the image.
Changelog:
v2:
- move the code to image-pre-load
- add support of stage pre-load for spl
- add support of stage pre-load on spl_ram
Philippe Reynes (6):
lib: allow to build asn1 decoder and oid registry in SPL
lib: crypto: allow to build crypyo in SPL
lib: rsa: allow rsa verify with pkey in SPL
common: image: add a stage pre-load
cmd: bootm: add a stage pre-load
common: spl: fit_ram: allow to use image pre load
cmd/Kconfig | 9 ++ cmd/bootm.c | 2 +- common/Kconfig.boot | 33 +++++ common/Makefile | 1 + common/bootm.c | 33 +++++ common/image-pre-load.c | 291 ++++++++++++++++++++++++++++++++++++++++ common/spl/spl_ram.c | 21 ++- include/image.h | 10 ++ lib/Kconfig | 6 + lib/Makefile | 9 +- lib/crypto/Kconfig | 15 +++ lib/crypto/Makefile | 19 ++- lib/rsa/Kconfig | 8 ++ 13 files changed, 446 insertions(+), 11 deletions(-) create mode 100644 common/image-pre-load.c
Signature · 1 line
2.17.1
RFC PATCH v2 1/6 lib: allow to build asn1 decoder and oid registry in SPL
This commit adds the options:
- SPL_ASN1_DECODER
- SPL_OID_REGISTRY
--- lib/Kconfig | 6 ++++++ lib/Makefile | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
lib/Kconfig +6 -0
@@ -758,11 +758,17 @@ config ASN1_DECODER help Enable asn1 decoder library. +config SPL_ASN1_DECODER + bool + config OID_REGISTRY bool help Enable fast lookup object identifier registry. +config SPL_OID_REGISTRY + bool + config SMBIOS_PARSER bool "SMBIOS parser" help
lib/Makefile +5 -2
@@ -17,7 +17,6 @@ obj-$(CONFIG_OF_LIVE) += of_live.o obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ obj-$(CONFIG_ARCH_AT91) += at91/ obj-$(CONFIG_OPTEE_LIB) += optee/ -obj-$(CONFIG_ASN1_DECODER) += asn1_decoder.o obj-y += crypto/ obj-$(CONFIG_AES) += aes.o
@@ -67,6 +66,7 @@ obj-$(CONFIG_SHA1) += sha1.o obj-$(CONFIG_SHA256) += sha256.o obj-$(CONFIG_SHA512) += sha512.o obj-$(CONFIG_CRYPT_PW) += crypt/ +obj-$(CONFIG_$(SPL_)ASN1_DECODER) += asn1_decoder.o obj-$(CONFIG_$(SPL_)ZLIB) += zlib/ obj-$(CONFIG_$(SPL_)ZSTD) += zstd/
@@ -128,9 +128,9 @@ obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o else # Main U-Boot always uses the full printf support obj-y += vsprintf.o strto.o -obj-$(CONFIG_OID_REGISTRY) += oid_registry.o obj-$(CONFIG_SSCANF) += sscanf.o endif +obj-$(CONFIG_$(SPL_)OID_REGISTRY) += oid_registry.o obj-y += abuf.o obj-y += date.o
@@ -141,6 +141,9 @@ obj-$(CONFIG_LIB_ELF) += elf.o # Build a fast OID lookup registry from include/linux/oid_registry.h # $(obj)/oid_registry.o: $(obj)/oid_registry_data.c +ifdef CONFIG_SPL_BUILD +CFLAGS_oid_registry.o += -I$(obj) +endif $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \ $(srctree)/scripts/build_OID_registry
Signature · 1 line
2.17.1
RFC PATCH v2 2/6 lib: crypto: allow to build crypyo in SPL
In reply to Philippe ReynesThis commit adds the options:
- SPL_ASYMMETRIC_KEY_TYPE
- SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- SPL_RSA_PUBLIC_KEY_PARSER
--- lib/Makefile | 2 +- lib/crypto/Kconfig | 15 +++++++++++++++ lib/crypto/Makefile | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 7 deletions(-)
lib/Makefile +1 -1
@@ -17,7 +17,6 @@ obj-$(CONFIG_OF_LIVE) += of_live.o obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ obj-$(CONFIG_ARCH_AT91) += at91/ obj-$(CONFIG_OPTEE_LIB) += optee/ -obj-y += crypto/ obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_AES) += aes/
@@ -57,6 +56,7 @@ obj-$(CONFIG_TPM_V1) += tpm-v1.o obj-$(CONFIG_TPM_V2) += tpm-v2.o endif +obj-y += crypto/ obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/ obj-$(CONFIG_$(SPL_)MD5) += md5.o obj-$(CONFIG_ECDSA) += ecdsa/
lib/crypto/Kconfig +15 -0
@@ -8,6 +8,10 @@ menuconfig ASYMMETRIC_KEY_TYPE if ASYMMETRIC_KEY_TYPE +config SPL_ASYMMETRIC_KEY_TYPE + bool "Asymmetric (public-key cryptographic) key Support within SPL" + depends on SPL + config ASYMMETRIC_PUBLIC_KEY_SUBTYPE bool "Asymmetric public-key crypto algorithm subtype" help
@@ -16,6 +20,10 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE appropriate hash algorithms (such as SHA-1) must be available. ENOPKG will be reported if the requisite algorithm is unavailable. +config SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE + bool "Asymmetric public-key crypto algorithm subtype within SPL" + depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE + config RSA_PUBLIC_KEY_PARSER bool "RSA public key parser" depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
@@ -27,6 +35,13 @@ config RSA_PUBLIC_KEY_PARSER public key data and provides the ability to instantiate a public key. +config SPL_RSA_PUBLIC_KEY_PARSER + bool "RSA public key parser within SPL" + depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE + select SPL_ASN1_DECODER + select ASN1_COMPILER + select SPL_OID_REGISTRY + config X509_CERTIFICATE_PARSER bool "X.509 certificate parser" depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
lib/crypto/Makefile +13 -6
@@ -3,27 +3,34 @@ # Makefile for asymmetric cryptographic keys # -obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o asymmetric_keys-y := asymmetric_type.o -obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o # # RSA public key parser # -obj-$(CONFIG_RSA_PUBLIC_KEY_PARSER) += rsa_public_key.o +obj-$(CONFIG_$(SPL_)RSA_PUBLIC_KEY_PARSER) += rsa_public_key.o rsa_public_key-y := \ rsapubkey.asn1.o \ rsa_helper.o $(obj)/rsapubkey.asn1.o: $(obj)/rsapubkey.asn1.c $(obj)/rsapubkey.asn1.h +ifdef CONFIG_SPL_BUILD +CFLAGS_rsapubkey.asn1.o += -I$(obj) +endif + $(obj)/rsa_helper.o: $(obj)/rsapubkey.asn1.h +ifdef CONFIG_SPL_BUILD +CFLAGS_rsa_helper.o += -I$(obj) +endif # # X.509 Certificate handling # -obj-$(CONFIG_X509_CERTIFICATE_PARSER) += x509_key_parser.o +obj-$(CONFIG_$(SPL_)X509_CERTIFICATE_PARSER) += x509_key_parser.o x509_key_parser-y := \ x509.asn1.o \ x509_akid.asn1.o \
@@ -40,11 +47,11 @@ $(obj)/x509_akid.asn1.o: $(obj)/x509_akid.asn1.c $(obj)/x509_akid.asn1.h # # PKCS#7 message handling # -obj-$(CONFIG_PKCS7_MESSAGE_PARSER) += pkcs7_message.o +obj-$(CONFIG_$(SPL_)PKCS7_MESSAGE_PARSER) += pkcs7_message.o pkcs7_message-y := \ pkcs7.asn1.o \ pkcs7_parser.o -obj-$(CONFIG_PKCS7_VERIFY) += pkcs7_verify.o +obj-$(CONFIG_$(SPL_)PKCS7_VERIFY) += pkcs7_verify.o $(obj)/pkcs7_parser.o: $(obj)/pkcs7.asn1.h $(obj)/pkcs7.asn1.o: $(obj)/pkcs7.asn1.c $(obj)/pkcs7.asn1.h
Signature · 1 line
2.17.1
RFC PATCH v2 3/6 lib: rsa: allow rsa verify with pkey in SPL
In reply to Philippe ReynesThis commit adds the option SPL_RSA_VERIFY_WITH_PKEY.
--- lib/rsa/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/rsa/Kconfig +8 -0
@@ -46,6 +46,14 @@ config RSA_VERIFY_WITH_PKEY directly specified in image_sign_info, where all the necessary key properties will be calculated on the fly in verification code. +config SPL_RSA_VERIFY_WITH_PKEY + bool "Execute RSA verification without key parameters from FDT within SPL" + depends on SPL + select SPL_RSA_VERIFY + select SPL_ASYMMETRIC_KEY_TYPE + select SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE + select SPL_RSA_PUBLIC_KEY_PARSER + config RSA_SOFTWARE_EXP bool "Enable driver for RSA Modular Exponentiation in software" depends on DM
Signature · 1 line
2.17.1
RFC PATCH v2 4/6 common: image: add a stage pre-load
In reply to Philippe ReynesThis commit adds a stage pre-load that could
check or modify an image.
For the moment, only a header with a signature is
supported. This header has this format:
- magic : 4 bytes
- image size : 4 bytes
- signature : n bytes
- padding : up to header size
The stage use a node /image/pre-load/sig to
get some information:
- header-size (mandatory) : size of the header
- algo-name (mandatory) : name of the algo used to sign
- padding-name : name of padding used to sign
- signature-size : size of the signature (in the header)
- mandatory : set to yes if this sig is mandatory
- public-key (madatory) : value of the public key
Before running the image, the stage pre-load check the signature provided in the header.
This is an initial support, later we could add the support of:
- ciphering
- uncompressing
- ...
--- common/Kconfig.boot | 33 +++++ common/Makefile | 1 + common/image-pre-load.c | 291 ++++++++++++++++++++++++++++++++++++++++ include/image.h | 9 ++ 4 files changed, 334 insertions(+) create mode 100644 common/image-pre-load.c
common/Kconfig.boot +33 -0
@@ -958,6 +958,39 @@ config AUTOBOOT_MENU_SHOW endmenu +menu "Image support" + +config IMAGE_PRE_LOAD + bool "Image pre-load support" + help + Enable image pre-load support + +config SPL_IMAGE_PRE_LOAD + bool "Image pre-load support within SPL" + depends on SPL && IMAGE_PRE_LOAD + help + Enable image pre-load support in SPL + +config IMAGE_PRE_LOAD_SIG + bool "Image pre-load signature support" + depends on IMAGE_PRE_LOAD + select FIT_SIGNATURE + select RSA + select RSA_VERIFY_WITH_PKEY + help + Enable image pre-load signature support + +config SPL_IMAGE_PRE_LOAD_SIG + bool "Image pre-load signature support witin SPL" + depends on SPL_IMAGE_PRE_LOAD && IMAGE_PRE_LOAD_SIG + select SPL_FIT_SIGNATURE + select SPL_RSA + select SPL_RSA_VERIFY_WITH_PKEY + help + Enable image pre-load signature support in SPL + +endmenu + config USE_BOOTARGS bool "Enable boot arguments" help
common/Makefile +1 -0
@@ -102,6 +102,7 @@ endif endif obj-y += image.o image-board.o +obj-$(CONFIG_$(SPL_TPL_)IMAGE_PRE_LOAD) += image-pre-load.o obj-$(CONFIG_$(SPL_TPL_)HASH) += hash.o obj-$(CONFIG_ANDROID_AB) += android_ab.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
common/image-pre-load.c new file +291 -0
291 lines not on this page · raw message
include/image.h +9 -0
@@ -48,6 +48,7 @@ struct fdt_region;extern ulong image_load_addr;/* Default Load Address */ extern ulong image_save_addr;/* Default Save Address */ extern ulong image_save_size;/* Default Save Size */ +extern ulong image_load_offset;/* Default Load Address Offset */ /* An invalid size, meaning that the image size is not known */ #define IMAGE_SIZE_INVAL (-1UL)
@@ -1289,6 +1290,14 @@ struct crypto_algo *image_get_crypto_algo(const char *full_name);*/ struct padding_algo *image_get_padding_algo (const char *name); +/** +* image_pre_load() - Manage pre load header +* +* @param addr Address of the image +* @return: 0 on success, -ve on error +*/ +int image_pre_load (ulong addr); +/** * fit_image_verify_required_sigs() - Verify signatures marked as 'required' *
Signature · 1 line
2.17.1
RFC PATCH v2 5/6 cmd: bootm: add a stage pre-load
In reply to Philippe ReynesThis commit adds a stage pre-load to the command
bootm. Right now, this stage may be used to read
a header and check the signature of the full
image.
--- cmd/Kconfig | 9 +++++++++ cmd/bootm.c | 2 +- common/bootm.c | 33 +++++++++++++++++++++++++++++++++ include/image.h | 1 + 4 files changed, 44 insertions(+), 1 deletion(-)
cmd/Kconfig +9 -0
@@ -194,6 +194,15 @@ config CMD_BOOTM help Boot an application image from the memory. +config CMD_BOOTM_PRE_LOAD + bool "enable pre-load on bootm" + depends on CMD_BOOTM + default n + help + Enable support of stage pre-load for the bootm command. + This stage allow to check of modifty the image provided + to the bootm command. + config BOOTM_EFI bool "Support booting UEFI FIT images" depends on CMD_BOOTEFI && CMD_BOOTM && FIT
cmd/bootm.c +1 -1
@@ -126,7 +126,7 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START | - BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER | + BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER | BOOTM_STATE_LOADOS | #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH BOOTM_STATE_RAMDISK |
common/bootm.c +33 -0
@@ -87,6 +87,33 @@ static int bootm_start(struct cmd_tbl *cmdtp, int flag, int argc,return 0 ; } +static ulong bootm_data_addr (int argc,char *const argv[]) +{ +ulong addr; + +if (argc >0 ) + addr =simple_strtoul (argv[0 ],NULL ,16 ); +else + addr = image_load_addr; + +return addr; +} + +static int bootm_pre_load (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +ulong data_addr =bootm_data_addr (argc, argv); +int ret =0 ; + +if (CONFIG_IS_ENABLED (CMD_BOOTM_PRE_LOAD )) + ret =image_pre_load (data_addr); + +if (ret) + ret =CMD_RET_FAILURE ; + +return ret; +} +static int bootm_find_os (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {
@@ -677,6 +704,9 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,if (states &BOOTM_STATE_START ) ret =bootm_start (cmdtp, flag, argc, argv); +if (!ret && (states &BOOTM_STATE_PRE_LOAD )) + ret =bootm_pre_load (cmdtp, flag, argc, argv); +if (!ret && (states &BOOTM_STATE_FINDOS )) ret =bootm_find_os (cmdtp, flag, argc, argv);
@@ -866,6 +896,9 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel); +if (CONFIG_IS_ENABLED (CMD_BOOTM_PRE_LOAD )) + img_addr += image_load_offset; +bootstage_mark (BOOTSTAGE_ID_CHECK_MAGIC );/* check image type, for FIT images get FIT kernel node */
include/image.h +1 -0
@@ -351,6 +351,7 @@ typedef struct bootm_headers {#define BOOTM_STATE_OS_PREP (0x00000100)#define BOOTM_STATE_OS_FAKE_GO (0x00000200)/* 'Almost' run the OS */ #define BOOTM_STATE_OS_GO (0x00000400) +#define BOOTM_STATE_PRE_LOAD (0x00000800)int state;#if defined(CONFIG_LMB ) && !defined(USE_HOSTCC )
Signature · 1 line
2.17.1
RFC PATCH v2 6/6 common: spl: fit_ram: allow to use image pre load
In reply to Philippe ReynesThis commit add the support of image pre load in spl or tpl when loading an image from ram.
--- common/spl/spl_ram.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
common/spl/spl_ram.c +20 -1
@@ -24,9 +24,17 @@static ulong spl_ram_load_read (struct spl_load_info *load,ulong sector,ulong count,void *buf) { +ulong addr; +debug ("%s: sector %lx, count %lx, buf %lx\n" , __func__, sector, count, (ulong )buf); -memcpy (buf, (void *)(CONFIG_SPL_LOAD_FIT_ADDRESS + sector), count); + + addr = (ulong )CONFIG_SPL_LOAD_FIT_ADDRESS + sector; +if (CONFIG_IS_ENABLED (IMAGE_PRE_LOAD )) + addr += image_load_offset; + +memcpy (buf, (void *)addr, count); +return count; }
@@ -37,6 +45,17 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS ; +if (CONFIG_IS_ENABLED (IMAGE_PRE_LOAD )) { +unsigned long addr = (unsigned long )header; +int ret =image_pre_load (addr); + +if (ret) +return ret; + + addr += image_load_offset; + header = (struct image_header *)addr; + } +#if CONFIG_IS_ENABLED (DFU )if (bootdev->boot_device ==BOOT_DEVICE_DFU )spl_dfu_cmd (0 ,"dfu_alt_info_ram" ,"ram" ,"0" );
Signature · 1 line
2.17.1