mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
6f08eee67f
fit_verify_header fails if it detects unit addresses "@". However, this will break tools like dumpimage on fit images which worked with previous versions of the tool (e.g. 2020.04 vs 2021.07). As an example the output of: dumpimage -l <fit image> is: FIT description: U-Boot fitImage for Linux Distribution Created: Thu Jan 1 01:00:00 1970 Image 0 (kernel@1) Description: Linux kernel Created: Thu Jan 1 01:00:00 1970 Type: Kernel Image Compression: gzip compressed Data Size: 6442456 Bytes = 6291.46 KiB = 6.14 MiB Architecture: AArch64 OS: Linux Load Address: 0x80080000 Entry Point: 0x80080000 Hash algo: sha256 Hash value: ... Image 1 (fdt@freescale_fsl-s32g274a-evb.dtb) Description: Flattened Device Tree blob Created: Thu Jan 1 01:00:00 1970 Type: Flat Device Tree Compression: uncompressed Data Size: 39661 Bytes = 38.73 KiB = 0.04 MiB Architecture: AArch64 Hash algo: sha256 Hash value: ... Default Configuration: 'conf@freescale_fsl-s32g274a-evb.dtb' Configuration 0 (conf@freescale_fsl-s32g274a-evb.dtb) Description: 1 Linux kernel, FDT blob Kernel: kernel@1 FDT: fdt@freescale_fsl-s32g274a-evb.dtb Hash algo: sha256 Hash value: unavailable But with newer version it shows: dumpimage -l <fit image> GP Header: Size d00dfeed LoadAddr 62f0a4 This commit will output a warning that unit addresses were detected but will not fail: dumpimage -l <fit image> Image contains unit addresses @, this will break signing ... Signed-off-by: Stefan Eichenberger <eichest@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
121 lines
2.5 KiB
C
121 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2014
|
|
* DENX Software Engineering
|
|
* Heiko Schocher <hs@denx.de>
|
|
*
|
|
* (C) Copyright 2008 Semihalf
|
|
*
|
|
* (C) Copyright 2000-2004
|
|
* DENX Software Engineering
|
|
* Wolfgang Denk, wd@denx.de
|
|
*
|
|
* Updated-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
* FIT image specific code abstracted from mkimage.c
|
|
* some functions added to address abstraction
|
|
*
|
|
* All rights reserved.
|
|
*/
|
|
|
|
#include "imagetool.h"
|
|
#include "mkimage.h"
|
|
#include "fit_common.h"
|
|
#include <image.h>
|
|
#include <u-boot/crc.h>
|
|
|
|
int fit_verify_header(unsigned char *ptr, int image_size,
|
|
struct image_tool_params *params)
|
|
{
|
|
int ret;
|
|
|
|
if (fdt_check_header(ptr) != EXIT_SUCCESS)
|
|
return EXIT_FAILURE;
|
|
|
|
ret = fit_check_format(ptr, IMAGE_SIZE_INVAL);
|
|
if (ret) {
|
|
if (ret != -EADDRNOTAVAIL)
|
|
return EXIT_FAILURE;
|
|
fprintf(stderr, "Image contains unit addresses @, this will break signing\n");
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
int fit_check_image_types(uint8_t type)
|
|
{
|
|
if (type == IH_TYPE_FLATDT)
|
|
return EXIT_SUCCESS;
|
|
else
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
int mmap_fdt(const char *cmdname, const char *fname, size_t size_inc,
|
|
void **blobp, struct stat *sbuf, bool delete_on_error,
|
|
bool read_only)
|
|
{
|
|
void *ptr;
|
|
int fd;
|
|
|
|
/* Load FIT blob into memory (we need to write hashes/signatures) */
|
|
fd = open(fname, (read_only ? O_RDONLY : O_RDWR) | O_BINARY);
|
|
|
|
if (fd < 0) {
|
|
fprintf(stderr, "%s: Can't open %s: %s\n",
|
|
cmdname, fname, strerror(errno));
|
|
goto err;
|
|
}
|
|
|
|
if (fstat(fd, sbuf) < 0) {
|
|
fprintf(stderr, "%s: Can't stat %s: %s\n",
|
|
cmdname, fname, strerror(errno));
|
|
goto err;
|
|
}
|
|
|
|
if (size_inc) {
|
|
sbuf->st_size += size_inc;
|
|
if (ftruncate(fd, sbuf->st_size)) {
|
|
fprintf(stderr, "%s: Can't expand %s: %s\n",
|
|
cmdname, fname, strerror(errno));
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
errno = 0;
|
|
ptr = mmap(0, sbuf->st_size,
|
|
(read_only ? PROT_READ : PROT_READ | PROT_WRITE), MAP_SHARED,
|
|
fd, 0);
|
|
if ((ptr == MAP_FAILED) || (errno != 0)) {
|
|
fprintf(stderr, "%s: Can't read %s: %s\n",
|
|
cmdname, fname, strerror(errno));
|
|
goto err;
|
|
}
|
|
|
|
/* check if ptr has a valid blob */
|
|
if (fdt_check_header(ptr)) {
|
|
fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
|
|
goto err;
|
|
}
|
|
|
|
/* expand if needed */
|
|
if (size_inc) {
|
|
int ret;
|
|
|
|
ret = fdt_open_into(ptr, ptr, sbuf->st_size);
|
|
if (ret) {
|
|
fprintf(stderr, "%s: Cannot expand FDT: %s\n",
|
|
cmdname, fdt_strerror(ret));
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
*blobp = ptr;
|
|
return fd;
|
|
|
|
err:
|
|
if (fd >= 0)
|
|
close(fd);
|
|
if (delete_on_error)
|
|
unlink(fname);
|
|
|
|
return -1;
|
|
}
|