tools: mkimage: make size_inc a signed type
PATCH 1/1 tools: mkimage: make size_inc a signed type
In the Fixes commit, I initialized size_inc from the return value of the new fit_estimate_hash_sig_size() helper. That helper may fail and report that by returning a negative value, but I overlooked that size_inc had type size_t, and hence the error check doesn't work.
Change size_inc to have type int so the error check works. Inside the loop, it is passed to another function as a size_t parameter, but that's fine, because we know it is non-negative, and its value may be incremented in steps of 1024 and is capped at ~64K, so it will certainly never overflow an int.
Addresses-Coverity-ID: 569495: Integer handling issues (NEGATIVE_RETURNS)
---
I'm a little puzzled by the report
919 break; 920 } >>> CID 569495: Integer handling issues (NEGATIVE_RETURNS) >>> "size_inc" is passed to a parameter that cannot be negative. 921 ret = fit_add_file_data(params, size_inc, tmpfile); 922 if (!ret || ret != -ENOSPC)
I would instead expect it to point out the lines
size_inc = fit_estimate_hash_sig_size(params, bakfile); if (size_inc < 0) goto err_system;
where that < 0 test is currently dead code.
Nevertheless, there is obviously an issue, and I do think this should make Coverity happy as well.
tools/fit_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/fit_image.c +1 -1
@@ -846,7 +846,7 @@ static int fit_handle_file(struct image_tool_params *params)char tmpfile[MKIMAGE_MAX_TMPFILE_LEN ];char bakfile[MKIMAGE_MAX_TMPFILE_LEN +4 ] = {0 };char cmd[MKIMAGE_MAX_DTC_CMDLINE_LEN ]; -size_t size_inc; +int size_inc;int ret =EXIT_FAILURE ;/* Flattened Image Tree (FIT) format handling */
Signature · 1 line
2.50.0
Quoted 5 lines · Rasmus Villemoes
In the Fixes commit, I initialized
size_incfrom the return value of the newfit_estimate_hash_sig_size()helper. That helper may fail and report that by returning a negative value, but I overlooked thatsize_inchad typesize_t, and hence the error check doesn't work.
Quoted 7 lines
Change
size_incto have type int so the error check works. Inside the loop, it is passed to another function as asize_tparameter, but that's fine, because we know it is non-negative, and its value may be incremented in steps of 1024 and is capped at ~64K, so it will certainly never overflow an int.[...]
Applied to u-boot/master, thanks!
[1/1] tools: mkimage: make size_inc a signed type
commit: f08e29351dcb4c07c940b8a4c6b7b3899b803980
Signature · 1 line
Tom