Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 835c30e368e9661a6d99179d948f64efebf5d1de

Authored by Troy Kisky
Committed by Stefano Babic
1 parent 7daaac5281
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

imximage: header.length of 4 is valid 

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -361,8 +361,8 @@
361 361 dcd_v2_t *dcd_v2 = &hdr_v2->dcd_table;
362 362 uint32_t size, version;
363 363  
364   - size = be16_to_cpu(dcd_v2->header.length) - 8;
365   - if (size > (MAX_HW_CFG_SIZE_V2 * sizeof(dcd_addr_data_t))) {
  364 + size = be16_to_cpu(dcd_v2->header.length);
  365 + if (size > (MAX_HW_CFG_SIZE_V2 * sizeof(dcd_addr_data_t)) + 8) {
366 366 fprintf(stderr,
367 367 "Error: Image corrupt DCD size %d exceed maximum %d\n",
368 368 (uint32_t)(size / sizeof(dcd_addr_data_t)),