More verifications for kwbimage in SPL
Subsystems (5)
cover More verifications for kwbimage in SPL
From: Marek Behún <[email protected]>
Hello Stefan,
this series adds more checks for kwbimage validity and consistency to SPL, mainly checking image data checksum.
Marek
Pali Rohár (5):
arm: mvebu: Check that kwbimage offset and blocksize are valid
SPL: Add struct spl_boot_device parameter into
spl_parse_board_header()
arm: mvebu: Check that kwbimage blockid matches boot mode
SPL: Add support for checking board / BootROM specific image types
arm: mvebu: Check for kwbimage data checksum
arch/arm/mach-mvebu/spl.c | 71 +++++++++++++++++++++++++---- arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- common/spl/spl.c | 13 +++++- common/spl/spl_ext.c | 9 ++-- common/spl/spl_fat.c | 11 +++-- common/spl/spl_legacy.c | 3 +- common/spl/spl_mmc.c | 43 ++++++++++------- common/spl/spl_nand.c | 5 +- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 4 +- common/spl/spl_onenand.c | 2 +- common/spl/spl_ram.c | 2 +- common/spl/spl_sata.c | 9 ++-- common/spl/spl_sdp.c | 2 +- common/spl/spl_spi.c | 9 ++-- common/spl/spl_ubi.c | 4 +- common/spl/spl_usb.c | 4 +- common/spl/spl_xip.c | 4 +- common/spl/spl_ymodem.c | 4 +- drivers/usb/gadget/f_sdp.c | 12 +++-- include/sdp.h | 3 +- include/spl.h | 7 +++ 22 files changed, 160 insertions(+), 65 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/5 arm: mvebu: Check that kwbimage offset and blocksize are valid
From: Pali Rohár <[email protected]>
There are certain restrictions for kwbimage offset and blocksize. Validate them.
--- arch/arm/mach-mvebu/spl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/mach-mvebu/spl.c +10 -0
@@ -163,6 +163,16 @@ int spl_parse_board_header(struct spl_image_info *spl_image, spl_image->offset *=512 ;#endif +if (spl_image->offset %4 !=0 ) { +printf ("ERROR: Wrong srcaddr in kwbimage\n" ); +return -EINVAL ; + } + +if (mhdr->blocksize <=4 || mhdr->blocksize %4 !=0 ) { +printf ("ERROR: Wrong blocksize in kwbimage\n" ); +return -EINVAL ; + } + spl_image->size = mhdr->blocksize; spl_image->entry_point = mhdr->execaddr; spl_image->load_addr = mhdr->destaddr;
Signature · 1 line
2.32.0
PATCH 2/5 SPL: Add struct spl_boot_device parameter into spl_parse_board_header()
In reply to Marek BehúnFrom: Pali Rohár <[email protected]>
Add parameter spl_boot_device to spl_parse_board_header(), which allows the implementations to see from which device we are booting and do boot-device-specific checks of the image header.
--- arch/arm/mach-mvebu/spl.c | 1 + arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- common/spl/spl.c | 4 ++- common/spl/spl_ext.c | 9 ++++-- common/spl/spl_fat.c | 11 +++++--- common/spl/spl_legacy.c | 3 +- common/spl/spl_mmc.c | 43 ++++++++++++++++++----------- common/spl/spl_nand.c | 5 ++-- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 4 +-- common/spl/spl_onenand.c | 2 +- common/spl/spl_ram.c | 2 +- common/spl/spl_sata.c | 9 +++--- common/spl/spl_sdp.c | 2 +- common/spl/spl_spi.c | 9 +++--- common/spl/spl_ubi.c | 4 +-- common/spl/spl_usb.c | 4 +-- common/spl/spl_xip.c | 4 +-- common/spl/spl_ymodem.c | 4 +-- drivers/usb/gadget/f_sdp.c | 12 ++++---- include/sdp.h | 3 +- include/spl.h | 7 +++++ 22 files changed, 90 insertions(+), 56 deletions(-)
arch/arm/mach-mvebu/spl.c +1 -0
@@ -101,6 +101,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)#endif int spl_parse_board_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const void *image_header,size_t size) {const struct kwbimage_main_hdr_v1 *mhdr = image_header;
arch/arm/mach-sunxi/spl_spi_sunxi.c +1 -1
@@ -348,7 +348,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, ret =spl_load_simple_fit (spl_image, &load, load_offset, header); }else { - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;
common/spl/spl.c +3 -1
@@ -312,6 +312,7 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,#endif __weak int spl_parse_board_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const void *image_header,size_t size) {return -EINVAL ;
@@ -326,6 +327,7 @@ __weak int spl_parse_legacy_header(struct spl_image_info *spl_image, }int spl_parse_image_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const struct image_header *header) {#if CONFIG_IS_ENABLED (LOAD_FIT_FULL )
@@ -369,7 +371,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, }#endif -if (!spl_parse_board_header (spl_image, (const void *)header,sizeof (*header))) +if (!spl_parse_board_header (spl_image, bootdev, (const void *)header,sizeof (*header)))return 0 ;#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
common/spl/spl_ext.c +6 -3
@@ -10,6 +10,7 @@#include <image.h> int spl_load_image_ext (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename) {
@@ -46,7 +47,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, goto end; } - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err <0 ) {puts ("spl: ext: failed to parse image header\n" ); goto end;
@@ -66,6 +67,7 @@ end:#if CONFIG_IS_ENABLED (OS_BOOT )int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {int err;
@@ -103,7 +105,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, } file =env_get ("falcon_image_file" );if (file) { - err =spl_load_image_ext (spl_image, block_dev, + err =spl_load_image_ext (spl_image, bootdev, block_dev, partition, file);if (err !=0 ) {puts ("spl: falling back to default\n" );
@@ -134,11 +136,12 @@ defaults: return -1; } -return spl_load_image_ext (spl_image, block_dev, partition, +return spl_load_image_ext (spl_image, bootdev, block_dev, partition,CONFIG_SPL_FS_LOAD_KERNEL_NAME ); }#else int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {return -ENOSYS ;
common/spl/spl_fat.c +7 -4
@@ -55,6 +55,7 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, }int spl_load_image_fat (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename) {
@@ -76,7 +77,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, err =file_fat_read (filename, (void *)CONFIG_SYS_LOAD_ADDR ,0 );if (err <=0 ) goto end; - err =spl_parse_image_header (spl_image, + err =spl_parse_image_header (spl_image, bootdev, (struct image_header *)CONFIG_SYS_LOAD_ADDR );if (err == -EAGAIN )return err;
@@ -94,7 +95,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image,return spl_load_simple_fit (spl_image, &load,0 , header); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err) goto end;
@@ -114,6 +115,7 @@ end:#if CONFIG_IS_ENABLED (OS_BOOT )int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {int err;
@@ -134,7 +136,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, } file =env_get ("falcon_image_file" );if (file) { - err =spl_load_image_fat (spl_image, block_dev, + err =spl_load_image_fat (spl_image, bootdev, block_dev, partition, file);if (err !=0 ) {puts ("spl: falling back to default\n" );
@@ -160,11 +162,12 @@ defaults: return -1; } -return spl_load_image_fat (spl_image, block_dev, partition, +return spl_load_image_fat (spl_image, bootdev, block_dev, partition,CONFIG_SPL_FS_LOAD_KERNEL_NAME ); }#else int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {return -ENOSYS ;
common/spl/spl_legacy.c +2 -1
@@ -76,6 +76,7 @@ static inline int spl_image_get_comp(const struct image_header *hdr) }int spl_load_legacy_img (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spl_load_info *load,ulong header) {__maybe_unused SizeT lzma_len;
@@ -87,7 +88,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image,/* Read header into local struct */ load->read (load, header,sizeof (hdr), &hdr); - ret =spl_parse_image_header (spl_image, &hdr); + ret =spl_parse_image_header (spl_image, bootdev, &hdr);if (ret)return ret;
common/spl/spl_mmc.c +27 -16
155 lines not on this page · raw message
common/spl/spl_nand.c +3 -2
@@ -65,6 +65,7 @@ struct mtd_info * __weak nand_get_mtd(void) }static int spl_nand_load_element (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,int offset,struct image_header *header) {struct mtd_info *mtd =nand_get_mtd ();
@@ -96,7 +97,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, load.read = spl_nand_fit_read;return spl_load_imx_container (spl_image, &load, offset / bl_len); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err; return nand_spl_load_image(offset, spl_image->size,
@@ -145,7 +146,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,/* load linux */ nand_spl_load_image (CONFIG_SYS_NAND_SPL_KERNEL_OFFS ,sizeof (*header), (void *)header); - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err;if (header->ih_os ==IH_OS_LINUX ) {
common/spl/spl_net.c +1 -1
@@ -58,7 +58,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image, }else {debug ("Legacy image\n" ); - rv =spl_parse_image_header (spl_image, header); + rv =spl_parse_image_header (spl_image, bootdev, header);if (rv)return rv;
common/spl/spl_nor.c +2 -2
@@ -66,7 +66,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,/* happy - was a Linux */ int ret; - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;
@@ -113,7 +113,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,if (IS_ENABLED (CONFIG_SPL_LEGACY_IMAGE_SUPPORT )) { load.bl_len =1 ; load.read = spl_nor_load_read; -return spl_load_legacy_img (spl_image, &load, +return spl_load_legacy_img (spl_image, bootdev, &load,spl_nor_get_uboot_base ()); }
common/spl/spl_onenand.c +1 -1
@@ -27,7 +27,7 @@ static int spl_onenand_load_image(struct spl_image_info *spl_image,/* Load u-boot */ onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS ,CONFIG_SYS_ONENAND_PAGE_SIZE , (void *)header); - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret; onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
common/spl/spl_ram.c +1 -1
@@ -70,7 +70,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, } header = (struct image_header *)map_sysmem (u_boot_pos,0 ); -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header); }return 0 ;
common/spl/spl_sata.c +5 -4
@@ -31,6 +31,7 @@#endif static int spl_sata_load_image_raw (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *stor_dev,unsigned long sector) {struct image_header *header;
@@ -45,7 +46,7 @@ static int spl_sata_load_image_raw(struct spl_image_info *spl_image,if (count ==0 )return -EIO ; - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;
@@ -90,18 +91,18 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,#if CONFIG_IS_ENABLED (OS_BOOT )if (spl_start_uboot () || -spl_load_image_fat_os (spl_image, stor_dev, +spl_load_image_fat_os (spl_image, bootdev, stor_dev, CONFIG_SYS_SATA_FAT_BOOT_PARTITION))#endif { err = -ENOSYS ;if (IS_ENABLED (CONFIG_SPL_FS_FAT )) { - err =spl_load_image_fat (spl_image, stor_dev, + err =spl_load_image_fat (spl_image, bootdev, stor_dev,CONFIG_SYS_SATA_FAT_BOOT_PARTITION ,CONFIG_SPL_FS_LOAD_PAYLOAD_NAME ); }else if (IS_ENABLED (CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR )) { - err =spl_sata_load_image_raw (spl_image, stor_dev, + err =spl_sata_load_image_raw (spl_image, bootdev, stor_dev,CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR ); } }
common/spl/spl_sdp.c +1 -1
@@ -39,7 +39,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,* or it loads a FIT image and returns it to be handled by the SPL * code. */ - ret =spl_sdp_handle (controller_index, spl_image); + ret =spl_sdp_handle (controller_index, spl_image, bootdev);debug ("SDP ended\n" );usb_gadget_release (controller_index);
common/spl/spl_spi.c +5 -4
@@ -24,6 +24,7 @@* the kernel and then device tree. */ static int spi_load_image_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spi_flash *flash,struct image_header *header) {
@@ -36,7 +37,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,if (image_get_magic (header) !=IH_MAGIC )return -1 ; - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err;
@@ -108,7 +109,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, }#if CONFIG_IS_ENABLED (OS_BOOT ) - if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) + if (spl_start_uboot() || spi_load_image_os(spl_image, bootdev, flash, header))#endif {/* Load u-boot, mkimage header is 64 bytes. */
@@ -127,7 +128,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, (void *)CONFIG_SYS_LOAD_ADDR);if (err)return err; - err =spl_parse_image_header (spl_image, + err =spl_parse_image_header (spl_image, bootdev, (struct image_header *)CONFIG_SYS_LOAD_ADDR ); }else if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) &&image_get_magic (header) ==FDT_MAGIC ) {
@@ -154,7 +155,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, err =spl_load_imx_container (spl_image, &load, payload_offs); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err; err = spi_flash_read(flash, payload_offs + spl_image->offset,
common/spl/spl_ubi.c +2 -2
@@ -55,7 +55,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, ret =ubispl_load_volumes (&info, volumes,2 );if (!ret) { header = (struct image_header *)volumes[0 ].load_addr; -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header);puts ("Linux loaded.\n" ); goto out; }
@@ -75,7 +75,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, ret =ubispl_load_volumes (&info, volumes,1 );if (!ret) -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header); out:#ifdef CONFIG_SPL_NAND_SUPPORT if (bootdev->boot_device ==BOOT_DEVICE_NAND )
common/spl/spl_usb.c +2 -2
@@ -49,10 +49,10 @@ int spl_usb_load(struct spl_image_info *spl_image,#if CONFIG_IS_ENABLED (OS_BOOT )if (spl_start_uboot () || - spl_load_image_fat_os(spl_image, stor_dev, partition)) + spl_load_image_fat_os(spl_image, bootdev, stor_dev, partition))#endif { - err =spl_load_image_fat (spl_image, stor_dev, partition, filename); + err =spl_load_image_fat (spl_image, bootdev, stor_dev, partition, filename); }if (err) {
common/spl/spl_xip.c +2 -2
@@ -24,7 +24,7 @@ static int spl_xip(struct spl_image_info *spl_image, return 0; }#endif -return (spl_parse_image_header (spl_image, (const struct image_header *) -CONFIG_SYS_UBOOT_BASE )); +return (spl_parse_image_header (spl_image, bootdev, + (const struct image_header *)CONFIG_SYS_UBOOT_BASE )); }SPL_LOAD_IMAGE_METHOD ("XIP" ,0 ,BOOT_DEVICE_XIP , spl_xip);
common/spl/spl_ymodem.c +2 -2
@@ -112,7 +112,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, addr += res; } - ret =spl_parse_image_header (spl_image, ih); + ret =spl_parse_image_header (spl_image, bootdev, ih);if (ret)return ret; } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
@@ -135,7 +135,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, size += res; }else { ih = (struct image_header *)buf; - ret =spl_parse_image_header (spl_image, ih); + ret =spl_parse_image_header (spl_image, bootdev, ih);if (ret) goto end_stream;#ifdef CONFIG_SPL_GZIP
drivers/usb/gadget/f_sdp.c +7 -5
@@ -773,7 +773,8 @@ static ulong search_container_header(ulong p, int size) }#endif -static int sdp_handle_in_ep (struct spl_image_info *spl_image) +static int sdp_handle_in_ep (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev) {u8 *data = sdp_func->in_req->buf;u32 status;
@@ -862,7 +863,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image)/* In SPL, allow jumps to U-Boot images */ struct spl_image_info spl_image = {}; -spl_parse_image_header (&spl_image, header); +spl_parse_image_header (&spl_image, bootdev, header);jump_to_image_no_args (&spl_image);#else /* In U-Boot, allow jumps to scripts */
@@ -910,7 +911,8 @@ static void sdp_handle_out_ep(void)#ifndef CONFIG_SPL_BUILD int sdp_handle(int controller_index)#else -int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image) +int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image, + struct spl_boot_device *bootdev)#endif {int flag =0 ;
@@ -928,9 +930,9 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image)usb_gadget_handle_interrupts (controller_index);#ifdef CONFIG_SPL_BUILD - flag =sdp_handle_in_ep (spl_image); + flag =sdp_handle_in_ep (spl_image, bootdev);#else - flag =sdp_handle_in_ep (NULL ); + flag =sdp_handle_in_ep (NULL , bootdev);#endif if (sdp_func->ep_int_enable)sdp_handle_out_ep ();
include/sdp.h +2 -1
@@ -14,7 +14,8 @@ int sdp_init(int controller_index);#ifdef CONFIG_SPL_BUILD #include <spl.h> -int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image); +int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image, +struct spl_boot_device *bootdev);#else int sdp_handle (int controller_index);#endif
include/spl.h +7 -0
@@ -29,6 +29,7 @@ struct image_header;struct blk_desc ;struct image_header ; +struct spl_boot_device ;/* * u_boot_first_phase() - check if this is the first U-Boot phase
@@ -340,6 +341,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,* Returns 0 on success. */ int spl_load_legacy_img (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spl_load_info *load,ulong header);/**
@@ -438,6 +440,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image);* @return 0 if a header was correctly parsed, -ve on error */ int spl_parse_image_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const struct image_header *header);void spl_board_prepare_for_linux (void );
@@ -574,18 +577,22 @@ static inline const char *spl_loader_name(const struct spl_image_loader *loader)/* SPL FAT image functions */ int spl_load_image_fat (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename);int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition);void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image);/* SPL EXT image functions */ int spl_load_image_ext (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename);int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition);/**
Signature · 1 line
2.32.0
PATCH 3/5 arm: mvebu: Check that kwbimage blockid matches boot mode
In reply to Marek BehúnFrom: Pali Rohár <[email protected]>
Each boot mode has its own kwbimage specified by blockid. So check that kwbimage is valid by blockid.
--- arch/arm/mach-mvebu/spl.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
arch/arm/mach-mvebu/spl.c +23 -9
@@ -118,22 +118,36 @@ int spl_parse_board_header(struct spl_image_info *spl_image,* (including SPL content) which is not included in U-Boot image_header. */ if (mhdr->version !=1 || - ((mhdr->headersz_msb <<16 ) | mhdr->headersz_lsb) <sizeof (*mhdr) || - ( + ((mhdr->headersz_msb <<16 ) | mhdr->headersz_lsb) <sizeof (*mhdr)) { +printf ("ERROR: Invalid kwbimage v1\n" ); +return -EINVAL ; + } +#ifdef CONFIG_SPL_SPI_FLASH_SUPPORT - mhdr->blockid !=IBR_HDR_SPI_ID && +if (bootdev->boot_device ==BOOT_DEVICE_SPI && + mhdr->blockid !=IBR_HDR_SPI_ID ) { +printf ("ERROR: Wrong blockid in SPI kwbimage\n" ); +return -EINVAL ; + }#endif +#ifdef CONFIG_SPL_SATA - mhdr->blockid !=IBR_HDR_SATA_ID && +if (bootdev->boot_device ==BOOT_DEVICE_SATA && + mhdr->blockid !=IBR_HDR_SATA_ID ) { +printf ("ERROR: Wrong blockid in SATA kwbimage\n" ); +return -EINVAL ; + }#endif +#ifdef CONFIG_SPL_MMC - mhdr->blockid !=IBR_HDR_SDIO_ID && -#endif -1 - )) { -printf ("ERROR: Not valid SPI/NAND/SATA/SDIO kwbimage v1\n" ); +if ((bootdev->boot_device ==BOOT_DEVICE_MMC1 || + bootdev->boot_device ==BOOT_DEVICE_MMC2 || + bootdev->boot_device ==BOOT_DEVICE_MMC2_2 ) && + mhdr->blockid !=IBR_HDR_SDIO_ID ) { +printf ("ERROR: Wrong blockid in SDIO kwbimage\n" );return -EINVAL ; } +#endif spl_image->offset = mhdr->srcaddr;
Signature · 1 line
2.32.0
PATCH 5/5 arm: mvebu: Check for kwbimage data checksum
In reply to Marek BehúnFrom: Pali Rohár <[email protected]>
Last 4 bytes of kwbimage boot image is checksum. Verify it via the new spl_check_board_image() function which is called by U-Boot SPL after loading kwbimage.
--- arch/arm/mach-mvebu/spl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm/mach-mvebu/spl.c +28 -0
@@ -100,6 +100,34 @@ u32 spl_mmc_boot_mode(const u32 boot_device) }#endif +static uint32_t checksum32 (void *start,uint32_t len) +{ +uint32_t csum =0 ; +uint32_t *p = start; + +while (len >0 ) { + csum += *p++; + len -=sizeof (uint32_t ); + }; + +return csum; +} + +int spl_check_board_image (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev) +{ +uint32_t csum = *(uint32_t *)(spl_image->load_addr + + spl_image->size -4 ); + +if (checksum32 ((void *)spl_image->load_addr, + spl_image->size -4 ) != csum) { +printf ("ERROR: Invalid data checksum in kwbimage\n" ); +return -EINVAL ; + } + +return 0 ; +} +int spl_parse_board_header (struct spl_image_info *spl_image,const struct spl_boot_device *bootdev,const void *image_header,size_t size)
Signature · 1 line
2.32.0
PATCH 4/5 SPL: Add support for checking board / BootROM specific image types
In reply to Marek BehúnFrom: Pali Rohár <[email protected]>
Commit 9baab60b8054 ("SPL: Add support for parsing board / BootROM specific image types") added support for loading board specific image types.
This commit adds support for a new weak function spl_parse_board_header() which is called after loading boot image. Board may implement this function for checking if loaded board specific image is valid.
--- common/spl/spl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
common/spl/spl.c +9 -0
@@ -589,6 +589,12 @@ static struct spl_image_loader *spl_ll_find_loader(uint boot_device)return NULL ; } +__weak int spl_check_board_image (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev) +{ +return 0 ; +} +static int spl_load_image (struct spl_image_info *spl_image,struct spl_image_loader *loader) {
@@ -610,6 +616,9 @@ static int spl_load_image(struct spl_image_info *spl_image, } }#endif +if (!ret) + ret =spl_check_board_image (spl_image, &bootdev); +return ret; }
Signature · 1 line
2.32.0
Re: [PATCH u-boot-marvell 1/5] arm: mvebu: Check that kwbimage offset and blocksize are valid
In reply to Marek BehúnQuoted 7 lines · Marek Behún
From: Pali Rohár <[email protected]>
There are certain restrictions for kwbimage offset and blocksize. Validate them.
Signed-off-by Pali Rohár <[email protected]>Signed-off-by Marek Behún <[email protected]>
Some nitpicking comments below...
Other than this:
Quoted 11 lines
--- arch/arm/mach-mvebu/spl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm/mach-mvebu/spl.c +0
-0@@ -163,6 +163,16 @@ int spl_parse_board_header(struct spl_image_info *spl_image, spl_image->offset *=512 ;#endif
arch/arm/mach-mvebu/spl.c int spl_parse_board_header(struct spl_image_info *spl_image, · line 174
Quoted 10 lines
arch/arm/mach-mvebu/spl.c +9
-0+if (spl_image->offset %4 !=0 ) { +printf ("ERROR: Wrong srcaddr in kwbimage\n" ); +return -EINVAL ; + } + +if (mhdr->blocksize <=4 || mhdr->blocksize %4 !=0 ) { +printf ("ERROR: Wrong blocksize in kwbimage\n" ); +return -EINVAL ; + }
It might make sense to print the incorrect srcaddr and / or blocksize in the error case, as this might help the user with solving the problem.
Thanks,
Stefan
arch/arm/mach-mvebu/spl.c int spl_parse_board_header(struct spl_image_info *spl_image, · line 178
Quoted 5 lines
arch/arm/mach-mvebu/spl.c +1
-0+ spl_image->size = mhdr->blocksize; spl_image->entry_point = mhdr->execaddr; spl_image->load_addr = mhdr->destaddr;
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH u-boot-marvell 2/5] SPL: Add struct spl_boot_device parameter into spl_parse_board_header()
In reply to Marek BehúnQuoted 8 lines · Marek Behún
From: Pali Rohár <[email protected]>
Add parameter
spl_boot_devicetospl_parse_board_header(), which allows the implementations to see from which device we are booting and do boot-device-specific checks of the image header.Signed-off-by Pali Rohár <[email protected]>Signed-off-by Marek Behún <[email protected]>
Thanks,
Stefan
Quoted 757 lines
--- arch/arm/mach-mvebu/spl.c | 1 + arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- common/spl/spl.c | 4 ++- common/spl/spl_ext.c | 9 ++++-- common/spl/spl_fat.c | 11 +++++--- common/spl/spl_legacy.c | 3 +- common/spl/spl_mmc.c | 43 ++++++++++++++++++----------- common/spl/spl_nand.c | 5 ++-- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 4 +-- common/spl/spl_onenand.c | 2 +- common/spl/spl_ram.c | 2 +- common/spl/spl_sata.c | 9 +++--- common/spl/spl_sdp.c | 2 +- common/spl/spl_spi.c | 9 +++--- common/spl/spl_ubi.c | 4 +-- common/spl/spl_usb.c | 4 +-- common/spl/spl_xip.c | 4 +-- common/spl/spl_ymodem.c | 4 +-- drivers/usb/gadget/f_sdp.c | 12 ++++---- include/sdp.h | 3 +- include/spl.h | 7 +++++ 22 files changed, 90 insertions(+), 56 deletions(-)arch/arm/mach-mvebu/spl.c +1
-0@@ -101,6 +101,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)#endif int spl_parse_board_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const void *image_header,size_t size) {const struct kwbimage_main_hdr_v1 *mhdr = image_header;arch/arm/mach-sunxi/spl_spi_sunxi.c +1
-1@@ -348,7 +348,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, ret =spl_load_simple_fit (spl_image, &load, load_offset, header); }else { - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;common/spl/spl.c +3
-1@@ -312,6 +312,7 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,#endif __weak int spl_parse_board_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const void *image_header,size_t size) {return -EINVAL ;@@ -326,6 +327,7 @@ __weak int spl_parse_legacy_header(struct spl_image_info *spl_image, }int spl_parse_image_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const struct image_header *header) {#if CONFIG_IS_ENABLED (LOAD_FIT_FULL )@@ -369,7 +371,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, }#endif -if (!spl_parse_board_header (spl_image, (const void *)header,sizeof (*header))) +if (!spl_parse_board_header (spl_image, bootdev, (const void *)header,sizeof (*header)))return 0 ;#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT common/spl/spl_ext.c +6
-3@@ -10,6 +10,7 @@#include <image.h> int spl_load_image_ext (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename) {@@ -46,7 +47,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, goto end; } - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err <0 ) {puts ("spl: ext: failed to parse image header\n" ); goto end;@@ -66,6 +67,7 @@ end:#if CONFIG_IS_ENABLED (OS_BOOT )int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {int err;@@ -103,7 +105,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, } file =env_get ("falcon_image_file" );if (file) { - err =spl_load_image_ext (spl_image, block_dev, + err =spl_load_image_ext (spl_image, bootdev, block_dev, partition, file);if (err !=0 ) {puts ("spl: falling back to default\n" );@@ -134,11 +136,12 @@ defaults: return -1; } -return spl_load_image_ext (spl_image, block_dev, partition, +return spl_load_image_ext (spl_image, bootdev, block_dev, partition,CONFIG_SPL_FS_LOAD_KERNEL_NAME ); }#else int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {return -ENOSYS ;common/spl/spl_fat.c +7
-4@@ -55,6 +55,7 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, }int spl_load_image_fat (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename) {@@ -76,7 +77,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, err =file_fat_read (filename, (void *)CONFIG_SYS_LOAD_ADDR ,0 );if (err <=0 ) goto end; - err =spl_parse_image_header (spl_image, + err =spl_parse_image_header (spl_image, bootdev, (struct image_header *)CONFIG_SYS_LOAD_ADDR );if (err == -EAGAIN )return err;@@ -94,7 +95,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image,return spl_load_simple_fit (spl_image, &load,0 , header); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err) goto end;@@ -114,6 +115,7 @@ end:#if CONFIG_IS_ENABLED (OS_BOOT )int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {int err;@@ -134,7 +136,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, } file =env_get ("falcon_image_file" );if (file) { - err =spl_load_image_fat (spl_image, block_dev, + err =spl_load_image_fat (spl_image, bootdev, block_dev, partition, file);if (err !=0 ) {puts ("spl: falling back to default\n" );@@ -160,11 +162,12 @@ defaults: return -1; } -return spl_load_image_fat (spl_image, block_dev, partition, +return spl_load_image_fat (spl_image, bootdev, block_dev, partition,CONFIG_SPL_FS_LOAD_KERNEL_NAME ); }#else int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition) {return -ENOSYS ;common/spl/spl_legacy.c +2
-1@@ -76,6 +76,7 @@ static inline int spl_image_get_comp(const struct image_header *hdr) }int spl_load_legacy_img (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spl_load_info *load,ulong header) {__maybe_unused SizeT lzma_len;@@ -87,7 +88,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image,/* Read header into local struct */ load->read (load, header,sizeof (hdr), &hdr); - ret =spl_parse_image_header (spl_image, &hdr); + ret =spl_parse_image_header (spl_image, bootdev, &hdr);if (ret)return ret;common/spl/spl_mmc.c +27
-16@@ -17,7 +17,9 @@#include <mmc.h> #include <image.h> -static int mmc_load_legacy (struct spl_image_info *spl_image,struct mmc *mmc, +static int mmc_load_legacy (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev, +struct mmc *mmc,ulong sector,struct image_header *header) {u32 image_offset_sectors;@@ -26,7 +28,7 @@ static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,u32 image_offset;int ret; - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;@@ -77,6 +79,7 @@ static __maybe_unused unsigned long spl_mmc_raw_uboot_offset(int part)static __maybe_unused int mmc_load_image_raw_sector (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct mmc *mmc,unsigned long sector) {unsigned long count;@@ -116,7 +119,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, ret =spl_load_imx_container (spl_image, &load, sector); }else { - ret =mmc_load_legacy (spl_image, mmc, sector, header); + ret =mmc_load_legacy (spl_image, bootdev, mmc, sector, header); } end:@@ -181,6 +184,7 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION static int mmc_load_image_raw_partition (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct mmc *mmc,int partition,unsigned long sector) {@@ -211,15 +215,16 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, }#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR -return mmc_load_image_raw_sector (spl_image, mmc, info.start + sector); +return mmc_load_image_raw_sector (spl_image, bootdev, mmc, info.start + sector);#else -return mmc_load_image_raw_sector (spl_image, mmc, info.start); +return mmc_load_image_raw_sector (spl_image, bootdev, mmc, info.start);#endif }#endif #if CONFIG_IS_ENABLED (OS_BOOT )static int mmc_load_image_raw_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct mmc *mmc) {int ret;@@ -239,7 +244,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, }#endif /* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */ - ret =mmc_load_image_raw_sector (spl_image, mmc, + ret =mmc_load_image_raw_sector (spl_image, bootdev, mmc,CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR );if (ret)return ret;@@ -257,6 +262,7 @@ int spl_start_uboot(void)return 1 ; }static int mmc_load_image_raw_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct mmc *mmc) {return -ENOSYS ;@@ -264,20 +270,22 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,#endif #ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION -static int spl_mmc_do_fs_boot (struct spl_image_info *spl_image,struct mmc *mmc, +static int spl_mmc_do_fs_boot (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev, +struct mmc *mmc,const char *filename) {int err = -ENOSYS ;#ifdef CONFIG_SPL_FS_FAT if (!spl_start_uboot ()) { - err =spl_load_image_fat_os (spl_image,mmc_get_blk_desc (mmc), + err =spl_load_image_fat_os (spl_image, bootdev,mmc_get_blk_desc (mmc),CONFIG_SYS_MMCSD_FS_BOOT_PARTITION );if (!err)return err; }#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME - err =spl_load_image_fat (spl_image,mmc_get_blk_desc (mmc), + err =spl_load_image_fat (spl_image, bootdev,mmc_get_blk_desc (mmc),CONFIG_SYS_MMCSD_FS_BOOT_PARTITION , filename);if (!err)@@ -286,13 +294,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,#endif #ifdef CONFIG_SPL_FS_EXT4 if (!spl_start_uboot ()) { - err =spl_load_image_ext_os (spl_image,mmc_get_blk_desc (mmc), + err =spl_load_image_ext_os (spl_image, bootdev,mmc_get_blk_desc (mmc),CONFIG_SYS_MMCSD_FS_BOOT_PARTITION );if (!err)return err; }#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME - err =spl_load_image_ext (spl_image,mmc_get_blk_desc (mmc), + err =spl_load_image_ext (spl_image, bootdev,mmc_get_blk_desc (mmc),CONFIG_SYS_MMCSD_FS_BOOT_PARTITION , filename);if (!err)@@ -307,7 +315,9 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc, return err; }#else -static int spl_mmc_do_fs_boot (struct spl_image_info *spl_image,struct mmc *mmc, +static int spl_mmc_do_fs_boot (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev, +struct mmc *mmc,const char *filename) {return -ENOSYS ;@@ -410,7 +420,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,debug ("spl: mmc boot mode: raw\n" );if (!spl_start_uboot ()) { - err =mmc_load_image_raw_os (spl_image, mmc); + err =mmc_load_image_raw_os (spl_image, bootdev, mmc);if (!err)return err; }@@ -418,13 +428,14 @@ int spl_mmc_load(struct spl_image_info *spl_image, raw_sect =spl_mmc_get_uboot_raw_sector (mmc, raw_sect);#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION - err =mmc_load_image_raw_partition (spl_image, mmc, raw_part, + err =mmc_load_image_raw_partition (spl_image, bootdev, + mmc, raw_part, raw_sect);if (!err)return err;#endif #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR - err =mmc_load_image_raw_sector (spl_image, mmc, + err =mmc_load_image_raw_sector (spl_image, bootdev, mmc, raw_sect +spl_mmc_raw_uboot_offset (part));if (!err)return err;@@ -433,7 +444,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,case MMCSD_MODE_FS :debug ("spl: mmc boot mode: fs\n" ); - err =spl_mmc_do_fs_boot (spl_image, mmc, filename); + err =spl_mmc_do_fs_boot (spl_image, bootdev, mmc, filename);if (!err)return err;common/spl/spl_nand.c +3
-2@@ -65,6 +65,7 @@ struct mtd_info * __weak nand_get_mtd(void) }static int spl_nand_load_element (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,int offset,struct image_header *header) {struct mtd_info *mtd =nand_get_mtd ();@@ -96,7 +97,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, load.read = spl_nand_fit_read;return spl_load_imx_container (spl_image, &load, offset / bl_len); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err; return nand_spl_load_image(offset, spl_image->size,@@ -145,7 +146,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,/* load linux */ nand_spl_load_image (CONFIG_SYS_NAND_SPL_KERNEL_OFFS ,sizeof (*header), (void *)header); - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err;if (header->ih_os ==IH_OS_LINUX ) {common/spl/spl_net.c +1
-1@@ -58,7 +58,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image, }else {debug ("Legacy image\n" ); - rv =spl_parse_image_header (spl_image, header); + rv =spl_parse_image_header (spl_image, bootdev, header);if (rv)return rv;common/spl/spl_nor.c +2
-2@@ -66,7 +66,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,/* happy - was a Linux */ int ret; - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;@@ -113,7 +113,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,if (IS_ENABLED (CONFIG_SPL_LEGACY_IMAGE_SUPPORT )) { load.bl_len =1 ; load.read = spl_nor_load_read; -return spl_load_legacy_img (spl_image, &load, +return spl_load_legacy_img (spl_image, bootdev, &load,spl_nor_get_uboot_base ()); }common/spl/spl_onenand.c +1
-1@@ -27,7 +27,7 @@ static int spl_onenand_load_image(struct spl_image_info *spl_image,/* Load u-boot */ onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS ,CONFIG_SYS_ONENAND_PAGE_SIZE , (void *)header); - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret; onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,common/spl/spl_ram.c +1
-1@@ -70,7 +70,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, } header = (struct image_header *)map_sysmem (u_boot_pos,0 ); -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header); }return 0 ;common/spl/spl_sata.c +5
-4@@ -31,6 +31,7 @@#endif static int spl_sata_load_image_raw (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *stor_dev,unsigned long sector) {struct image_header *header;@@ -45,7 +46,7 @@ static int spl_sata_load_image_raw(struct spl_image_info *spl_image,if (count ==0 )return -EIO ; - ret =spl_parse_image_header (spl_image, header); + ret =spl_parse_image_header (spl_image, bootdev, header);if (ret)return ret;@@ -90,18 +91,18 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,#if CONFIG_IS_ENABLED (OS_BOOT )if (spl_start_uboot () || -spl_load_image_fat_os (spl_image, stor_dev, +spl_load_image_fat_os (spl_image, bootdev, stor_dev, CONFIG_SYS_SATA_FAT_BOOT_PARTITION))#endif { err = -ENOSYS ;if (IS_ENABLED (CONFIG_SPL_FS_FAT )) { - err =spl_load_image_fat (spl_image, stor_dev, + err =spl_load_image_fat (spl_image, bootdev, stor_dev,CONFIG_SYS_SATA_FAT_BOOT_PARTITION ,CONFIG_SPL_FS_LOAD_PAYLOAD_NAME ); }else if (IS_ENABLED (CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR )) { - err =spl_sata_load_image_raw (spl_image, stor_dev, + err =spl_sata_load_image_raw (spl_image, bootdev, stor_dev,CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR ); } }common/spl/spl_sdp.c +1
-1@@ -39,7 +39,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,* or it loads a FIT image and returns it to be handled by the SPL * code. */ - ret =spl_sdp_handle (controller_index, spl_image); + ret =spl_sdp_handle (controller_index, spl_image, bootdev);debug ("SDP ended\n" );usb_gadget_release (controller_index);common/spl/spl_spi.c +5
-4@@ -24,6 +24,7 @@* the kernel and then device tree. */ static int spi_load_image_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spi_flash *flash,struct image_header *header) {@@ -36,7 +37,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,if (image_get_magic (header) !=IH_MAGIC )return -1 ; - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err;@@ -108,7 +109,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, }#if CONFIG_IS_ENABLED (OS_BOOT ) - if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) + if (spl_start_uboot() || spi_load_image_os(spl_image, bootdev, flash, header))#endif {/* Load u-boot, mkimage header is 64 bytes. */ @@ -127,7 +128,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, (void *)CONFIG_SYS_LOAD_ADDR);if (err)return err; - err =spl_parse_image_header (spl_image, + err =spl_parse_image_header (spl_image, bootdev, (struct image_header *)CONFIG_SYS_LOAD_ADDR ); }else if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) &&image_get_magic (header) ==FDT_MAGIC ) {@@ -154,7 +155,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, err =spl_load_imx_container (spl_image, &load, payload_offs); }else { - err =spl_parse_image_header (spl_image, header); + err =spl_parse_image_header (spl_image, bootdev, header);if (err)return err; err = spi_flash_read(flash, payload_offs + spl_image->offset,common/spl/spl_ubi.c +2
-2@@ -55,7 +55,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, ret =ubispl_load_volumes (&info, volumes,2 );if (!ret) { header = (struct image_header *)volumes[0 ].load_addr; -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header);puts ("Linux loaded.\n" ); goto out; }@@ -75,7 +75,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, ret =ubispl_load_volumes (&info, volumes,1 );if (!ret) -spl_parse_image_header (spl_image, header); +spl_parse_image_header (spl_image, bootdev, header); out:#ifdef CONFIG_SPL_NAND_SUPPORT if (bootdev->boot_device ==BOOT_DEVICE_NAND )common/spl/spl_usb.c +2
-2@@ -49,10 +49,10 @@ int spl_usb_load(struct spl_image_info *spl_image,#if CONFIG_IS_ENABLED (OS_BOOT )if (spl_start_uboot () || - spl_load_image_fat_os(spl_image, stor_dev, partition)) + spl_load_image_fat_os(spl_image, bootdev, stor_dev, partition))#endif { - err =spl_load_image_fat (spl_image, stor_dev, partition, filename); + err =spl_load_image_fat (spl_image, bootdev, stor_dev, partition, filename); }if (err) {common/spl/spl_xip.c +2
-2@@ -24,7 +24,7 @@ static int spl_xip(struct spl_image_info *spl_image, return 0; }#endif -return (spl_parse_image_header (spl_image, (const struct image_header *) -CONFIG_SYS_UBOOT_BASE )); +return (spl_parse_image_header (spl_image, bootdev, + (const struct image_header *)CONFIG_SYS_UBOOT_BASE )); }SPL_LOAD_IMAGE_METHOD ("XIP" ,0 ,BOOT_DEVICE_XIP , spl_xip);common/spl/spl_ymodem.c +2
-2@@ -112,7 +112,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, addr += res; } - ret =spl_parse_image_header (spl_image, ih); + ret =spl_parse_image_header (spl_image, bootdev, ih);if (ret)return ret; } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&@@ -135,7 +135,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, size += res; }else { ih = (struct image_header *)buf; - ret =spl_parse_image_header (spl_image, ih); + ret =spl_parse_image_header (spl_image, bootdev, ih);if (ret) goto end_stream;#ifdef CONFIG_SPL_GZIP drivers/usb/gadget/f_sdp.c +7
-5@@ -773,7 +773,8 @@ static ulong search_container_header(ulong p, int size) }#endif -static int sdp_handle_in_ep (struct spl_image_info *spl_image) +static int sdp_handle_in_ep (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev) {u8 *data = sdp_func->in_req->buf;u32 status;@@ -862,7 +863,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image)/* In SPL, allow jumps to U-Boot images */ struct spl_image_info spl_image = {}; -spl_parse_image_header (&spl_image, header); +spl_parse_image_header (&spl_image, bootdev, header);jump_to_image_no_args (&spl_image);#else /* In U-Boot, allow jumps to scripts */ @@ -910,7 +911,8 @@ static void sdp_handle_out_ep(void)#ifndef CONFIG_SPL_BUILD int sdp_handle(int controller_index)#else -int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image) +int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image, + struct spl_boot_device *bootdev)#endif {int flag =0 ;@@ -928,9 +930,9 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image)usb_gadget_handle_interrupts (controller_index);#ifdef CONFIG_SPL_BUILD - flag =sdp_handle_in_ep (spl_image); + flag =sdp_handle_in_ep (spl_image, bootdev);#else - flag =sdp_handle_in_ep (NULL ); + flag =sdp_handle_in_ep (NULL , bootdev);#endif if (sdp_func->ep_int_enable)sdp_handle_out_ep ();include/sdp.h +2
-1@@ -14,7 +14,8 @@ int sdp_init(int controller_index);#ifdef CONFIG_SPL_BUILD #include <spl.h> -int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image); +int spl_sdp_handle (int controller_index,struct spl_image_info *spl_image, +struct spl_boot_device *bootdev);#else int sdp_handle (int controller_index);#endif include/spl.h +5
-0@@ -29,6 +29,7 @@ struct image_header;struct blk_desc ;struct image_header ; +struct spl_boot_device ;/* * u_boot_first_phase() - check if this is the first U-Boot phase @@ -340,6 +341,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,* Returns 0 on success. */ int spl_load_legacy_img (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct spl_load_info *load,ulong header);/** @@ -438,6 +440,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image);* @return 0 if a header was correctly parsed, -ve on error */ int spl_parse_image_header (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev,const struct image_header *header);void spl_board_prepare_for_linux (void );@@ -574,18 +577,22 @@ static inline const char *spl_loader_name(const struct spl_image_loader *loader)/* SPL FAT image functions */ int spl_load_image_fat (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename);int spl_load_image_fat_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition);void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image);
include/spl.h static inline const char *spl_loader_name(const struct spl_image_loader *loader) · line 598
Quoted 10 lines
include/spl.h +2
-0/* SPL EXT image functions */ int spl_load_image_ext (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition,const char *filename);int spl_load_image_ext_os (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev,struct blk_desc *block_dev,int partition);/**
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH u-boot-marvell 3/5] arm: mvebu: Check that kwbimage blockid matches boot mode
In reply to Marek BehúnQuoted 7 lines · Marek Behún
From: Pali Rohár <[email protected]>
Each boot mode has its own kwbimage specified by blockid. So check that kwbimage is valid by blockid.
Signed-off-by Pali Rohár <[email protected]>Signed-off-by Marek Behún <[email protected]>
Again, some minor comments below...
Other than this:
Quoted 38 lines
--- arch/arm/mach-mvebu/spl.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)arch/arm/mach-mvebu/spl.c +17
-4@@ -118,22 +118,36 @@ int spl_parse_board_header(struct spl_image_info *spl_image,* (including SPL content) which is not included in U-Boot image_header. */ if (mhdr->version !=1 || - ((mhdr->headersz_msb << 16) | mhdr->headersz_lsb) < sizeof(*mhdr) || - ( + ((mhdr->headersz_msb <<16 ) | mhdr->headersz_lsb) <sizeof (*mhdr)) { +printf ("ERROR: Invalid kwbimage v1\n" ); +return -EINVAL ; + } +#ifdef CONFIG_SPL_SPI_FLASH_SUPPORT - mhdr->blockid != IBR_HDR_SPI_ID && +if (bootdev->boot_device ==BOOT_DEVICE_SPI && + mhdr->blockid !=IBR_HDR_SPI_ID ) { +printf ("ERROR: Wrong blockid in SPI kwbimage\n" ); +return -EINVAL ; + }#endif +#ifdef CONFIG_SPL_SATA - mhdr->blockid != IBR_HDR_SATA_ID && +if (bootdev->boot_device ==BOOT_DEVICE_SATA && + mhdr->blockid !=IBR_HDR_SATA_ID ) { +printf ("ERROR: Wrong blockid in SATA kwbimage\n" ); +return -EINVAL ; + }#endif +#ifdef CONFIG_SPL_MMC
arch/arm/mach-mvebu/spl.c int spl_parse_board_header(struct spl_image_info *spl_image, · line 147
Quoted 10 lines
arch/arm/mach-mvebu/spl.c +5
-5- mhdr->blockid != IBR_HDR_SDIO_ID && -#endif - 1 - )) { -printf ("ERROR: Not valid SPI/NAND/SATA/SDIO kwbimage v1\n" ); +if ((bootdev->boot_device ==BOOT_DEVICE_MMC1 || + bootdev->boot_device ==BOOT_DEVICE_MMC2 || + bootdev->boot_device ==BOOT_DEVICE_MMC2_2 ) && + mhdr->blockid !=IBR_HDR_SDIO_ID ) { +printf ("ERROR: Wrong blockid in SDIO kwbimage\n" );
Again it might be helpful for users to print the incorrect blockid in these cases.
Thanks,
Stefan
arch/arm/mach-mvebu/spl.c int spl_parse_board_header(struct spl_image_info *spl_image, · line 153
Quoted 7 lines
arch/arm/mach-mvebu/spl.c +1
-0return -EINVAL; } +#endif spl_image->offset = mhdr->srcaddr;
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH u-boot-marvell 4/5] SPL: Add support for checking board / BootROM specific image types
In reply to Marek BehúnQuoted 33 lines · Marek Behún
From: Pali Rohár <[email protected]>
Commit
9baab60b8054("SPL: Add support for parsing board / BootROM specific image types") added support for loading board specific image types.This commit adds support for a new weak function
spl_parse_board_header()which is called after loading boot image. Board may implement this function for checking if loaded board specific image is valid.Signed-off-by Pali Rohár <[email protected]>Signed-off-by Marek Behún <[email protected]>--- common/spl/spl.c | 9 +++++++++ 1 file changed, 9 insertions(+)common/spl/spl.c +6
-0@@ -589,6 +589,12 @@ static struct spl_image_loader *spl_ll_find_loader(uint boot_device)return NULL ; } +__weak int spl_check_board_image (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev) +{ +return 0 ; +} +static int spl_load_image (struct spl_image_info *spl_image,struct spl_image_loader *loader) {
common/spl/spl.c static int spl_load_image(struct spl_image_info *spl_image, · line 621
Quoted 6 lines
common/spl/spl.c +3
-0@@ -610,6 +616,9 @@ static int spl_load_image(struct spl_image_info *spl_image, } }#endif +if (!ret) + ret =spl_check_board_image (spl_image, &bootdev); +
I'm not a big fan of new __weak functions. But we already have some of them here in the SPL interface and I don't a clear idea on how to change this now.
So:
Thanks,
Stefan
Re: [PATCH u-boot-marvell 5/5] arm: mvebu: Check for kwbimage data checksum
In reply to Marek BehúnQuoted 17 lines · Marek Behún
From: Pali Rohár <[email protected]>
Last 4 bytes of kwbimage boot image is checksum. Verify it via the new
spl_check_board_image()function which is called by U-Boot SPL after loading kwbimage.Signed-off-by Pali Rohár <[email protected]>Signed-off-by Marek Behún <[email protected]>--- arch/arm/mach-mvebu/spl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm/mach-mvebu/spl.c +0
-0
arch/arm/mach-mvebu/spl.c u32 spl_mmc_boot_mode(const u32 boot_device) · line 106
Quoted 7 lines
arch/arm/mach-mvebu/spl.c +4
-0@@ -100,6 +100,34 @@ u32 spl_mmc_boot_mode(const u32 boot_device) }#endif +static uint32_t checksum32 (void *start,uint32_t len) +{ +uint32_t csum =0 ; +uint32_t *p = start;
Just curious: Doesn't checkpatch complain about using uint32_t instead of u32?
Other than this:
Thanks,
Stefan
Quoted 18 lines
arch/arm/mach-mvebu/spl.c +17
-0+ +while (len >0 ) { + csum += *p++; + len -=sizeof (uint32_t ); + }; + +return csum; +} + +int spl_check_board_image (struct spl_image_info *spl_image, +const struct spl_boot_device *bootdev) +{ +uint32_t csum = *(uint32_t *)(spl_image->load_addr + + spl_image->size -4 ); + +if (checksum32 ((void *)spl_image->load_addr, + spl_image->size -4 ) != csum) {
arch/arm/mach-mvebu/spl.c u32 spl_mmc_boot_mode(const u32 boot_device) · line 133
Quoted 10 lines
arch/arm/mach-mvebu/spl.c +7
-0+printf ("ERROR: Invalid data checksum in kwbimage\n" ); +return -EINVAL ; + } + +return 0 ; +} +int spl_parse_board_header (struct spl_image_info *spl_image,const struct spl_boot_device *bootdev,const void *image_header,size_t size)
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]