Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 454e3d90302d52b619e6df7ebbe716964cee016e

Authored by Stefan Brüns
Committed by Tom Rini
1 parent ae1755be37
Exists in v2017.01-smarct4x and in 25 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_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

cmd/fat: Do not crash on write when <bytes> is not specified 

argc is checked, but is off by one. In case <bytes> is not specified,
create an empty file, which is identical to the ext4write behaviour.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

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

... ... @@ -126,7 +126,7 @@
126 126 return 1;
127 127 }
128 128 addr = simple_strtoul(argv[3], NULL, 16);
129   - count = simple_strtoul(argv[5], NULL, 16);
  129 + count = (argc <= 5) ? 0 : simple_strtoul(argv[5], NULL, 16);
130 130  
131 131 buf = map_sysmem(addr, count);
132 132 ret = file_fat_write(argv[4], buf, 0, count, &size);
... ... @@ -145,7 +145,7 @@
145 145 U_BOOT_CMD(
146 146 fatwrite, 6, 0, do_fat_fswrite,
147 147 "write file into a dos filesystem",
148   - "<interface> <dev[:part]> <addr> <filename> <bytes>\n"
  148 + "<interface> <dev[:part]> <addr> <filename> [<bytes>]\n"
149 149 " - write file 'filename' from the address 'addr' in RAM\n"
150 150 " to 'dev' on 'interface'"
151 151 );