tools: imximage: Fix check array index
PATCH 1/1 tools: imximage: Fix check array index
The struct dcd_v1_t is initialized to MAX_HW_CFG_SIZE_V1 (60) structs 'dcd_type_addr_data_t', so the indexes to use on its elements are [0,59]. But on line 478, the variable 'length' can take on the value 60, which applies to array overflow: cd_v1->addr_data[length].type Thus, it is necessary to tighten the check on the 'size' variable on line 463.
--- tools/imximage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/imximage.c +1 -1
@@ -460,7 +460,7 @@ static void print_hdr_v1(struct imx_header *imx_hdr)uint32_t size, length, ver; size = dcd_v1->preamble.length; -if (size > (MAX_HW_CFG_SIZE_V1 *sizeof (dcd_type_addr_data_t))) { +if (size >= (MAX_HW_CFG_SIZE_V1 *sizeof (dcd_type_addr_data_t))) { fprintf(stderr, "Error: Image corrupt DCD size %d exceed maximum %d\n", (uint32_t)(size / sizeof(dcd_type_addr_data_t)),
Signature · 1 line
2.17.1
PATCH 1/1 tools: imximage: Fix check array index
Quoted 7 lines
The struct
dcd_v1_tis initialized toMAX_HW_CFG_SIZE_V1(60)
structs 'dcd_type_addr_data_t', so the indexes to use on its elements are [0,59]. But on line 478, the variable 'length' can take on the value 60, which applies to array overflow: cd_v1->addr_data[length].type Thus, it is necessary to tighten the check on the 'size' variable on line 463.Fixes 0b0c6af38738 ("Prepare v2020.01")Signed-off-by Mikhail Ilin <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================