diff options
| author | Simon Glass <[email protected]> | 2021-02-15 17:08:09 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-02-15 22:31:52 -0500 |
| commit | c5819701a3de61e2ba2ef7ad0b616565b32305e5 (patch) | |
| tree | 2d78afc29b784d5477102dabfc94215781126ae0 /tools | |
| parent | d5f3aadacbc63df3b690d6fd9f0aa3f575b43356 (diff) | |
image: Adjust the workings of fit_check_format()
At present this function does not accept a size for the FIT. This means
that it must be read from the FIT itself, introducing potential security
risk. Update the function to include a size parameter, which can be
invalid, in which case fit_check_format() calculates it.
For now no callers pass the size, but this can be updated later.
Also adjust the return value to an error code so that all the different
types of problems can be distinguished by the user.
Signed-off-by: Simon Glass <[email protected]>
Reported-by: Bruce Monroe <[email protected]>
Reported-by: Arie Haenel <[email protected]>
Reported-by: Julien Lenoir <[email protected]>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/fit_common.c | 3 | ||||
| -rw-r--r-- | tools/fit_image.c | 2 | ||||
| -rw-r--r-- | tools/mkimage.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/tools/fit_common.c b/tools/fit_common.c index cdf987d3c13..52b63296f89 100644 --- a/tools/fit_common.c +++ b/tools/fit_common.c @@ -26,7 +26,8 @@ int fit_verify_header(unsigned char *ptr, int image_size, struct image_tool_params *params) { - if (fdt_check_header(ptr) != EXIT_SUCCESS || !fit_check_format(ptr)) + if (fdt_check_header(ptr) != EXIT_SUCCESS || + fit_check_format(ptr, IMAGE_SIZE_INVAL)) return EXIT_FAILURE; return EXIT_SUCCESS; diff --git a/tools/fit_image.c b/tools/fit_image.c index 06faeda7c26..d440d143c67 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -883,7 +883,7 @@ static int fit_extract_contents(void *ptr, struct image_tool_params *params) /* Indent string is defined in header image.h */ p = IMAGE_INDENT_STRING; - if (!fit_check_format(fit)) { + if (fit_check_format(fit, IMAGE_SIZE_INVAL)) { printf("Bad FIT image format\n"); return -1; } diff --git a/tools/mkimage.h b/tools/mkimage.h index 5b096a545b7..0d3148444c3 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -29,6 +29,8 @@ #define debug(fmt,args...) #endif /* MKIMAGE_DEBUG */ +#define log_debug(fmt, args...) debug(fmt, ##args) + static inline void *map_sysmem(ulong paddr, unsigned long len) { return (void *)(uintptr_t)paddr; |