diff options
| author | Jordan Hand <jordanhand22@gmail.com> | 2019-03-05 14:47:56 -0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-08 11:31:44 -0500 |
| commit | d32aa3cae44e618048ff7f378577d44f9b6d6dcc (patch) | |
| tree | fc4cfbe78b9629281ee4a8c1ccead9204afa9224 /tools/fit_common.c | |
| parent | 280fafff165428bc69db221faaccaf4edfc32d9d (diff) | |
| download | u-boot-d32aa3cae44e618048ff7f378577d44f9b6d6dcc.tar.gz u-boot-d32aa3cae44e618048ff7f378577d44f9b6d6dcc.tar.xz u-boot-d32aa3cae44e618048ff7f378577d44f9b6d6dcc.zip | |
fdt: Fix FIT header verification in mkimage and conduct same checks as bootm
FIT header verification in mkimage was treating a return code as a boolean,
which meant that failures in validating the fit were seen as successes.
Additionally, mkimage was checking all formats to find a header which
passes validation, rather than using the image type specified to
mkimage.
checkpatch.pl checks for lines ending with '(' and alignment matching
open parentheses are ignored to keep with existing coding style.
Signed-off-by: Jordan Hand <jorhand@microsoft.com>
Diffstat (limited to 'tools/fit_common.c')
| -rw-r--r-- | tools/fit_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/fit_common.c b/tools/fit_common.c index d96085eaad..9506390214 100644 --- a/tools/fit_common.c +++ b/tools/fit_common.c @@ -26,7 +26,10 @@ int fit_verify_header(unsigned char *ptr, int image_size, struct image_tool_params *params) { - return fdt_check_header(ptr); + if (fdt_check_header(ptr) != EXIT_SUCCESS || !fit_check_format(ptr)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int fit_check_image_types(uint8_t type) |