Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e1b0f6fe3d0a0317486fb879e83dc1440cac3029

Authored by Mugunthan V N
Committed by Marek Vasut
1 parent 4d5b637843
Exists in v2017.01-smarct4x and in 29 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, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

drivers: dfu: ram: fix a crash with dfu ram with invalid dfu_alt_info env 

U-Boot crashes when an invalid dfu_alt_info is set and tried
using dfu command. Fixing this as it is handled in dfu-mmc.

=> dfu 0 ram 0
data abort
pc : [<9ff893d6>]          lr : [<9ff6edb9>]
reloc pc : [<808323d6>]    lr : [<80817db9>]
sp : 9ef36cf0  ip : 00000158     fp : 9ffbc0b8
r10: 9ffbc0b8  r9 : 9ef36ed8     r8 : 00000000
r7 : 00000000  r6 : 9ffbc0c8     r5 : 9ef36cfc  r4 : 9ef392c8
r3 : 00000004  r2 : 00000000     r1 : 9ff9a985  r0 : ffffffff
Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32
Resetting CPU ...

resetting ...

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

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

drivers/dfu/dfu_ram.c
Diff comments   View file @ e1b0f6f
... ... @@ -54,19 +54,26 @@
54 54  
55 55 int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, char *s)
56 56 {
57   - char *st;
  57 + const char *argv[3];
  58 + const char **parg = argv;
58 59  
  60 + for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {
  61 + *parg = strsep(&s, " ");
  62 + if (*parg == NULL) {
  63 + error("Invalid number of arguments.\n");
  64 + return -ENODEV;
  65 + }
  66 + }
  67 +
59 68 dfu->dev_type = DFU_DEV_RAM;
60   - st = strsep(&s, " ");
61   - if (strcmp(st, "ram")) {
62   - error("unsupported device: %s\n", st);
  69 + if (strcmp(argv[0], "ram")) {
  70 + error("unsupported device: %s\n", argv[0]);
63 71 return -ENODEV;
64 72 }
65 73  
66 74 dfu->layout = DFU_RAM_ADDR;
67   - dfu->data.ram.start = (void *)simple_strtoul(s, &s, 16);
68   - s++;
69   - dfu->data.ram.size = simple_strtoul(s, &s, 16);
  75 + dfu->data.ram.start = (void *)simple_strtoul(argv[1], NULL, 0);
  76 + dfu->data.ram.size = simple_strtoul(argv[2], NULL, 0);
70 77  
71 78 dfu->write_medium = dfu_write_medium_ram;
72 79 dfu->get_medium_size = dfu_get_medium_size_ram;