colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd: fdt: Check argc before accessing argv in fdt memory

Browse Source 
On case 'fdt memory' is invoked without parameters, argv[2]/argv[3]
is not valid and this command would SEGFAULT in sandbox environment.
Add missing argc test to avoid the crash and rather print usage help
message.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Vasut
2023-03-02 04:08:19 +01:00
committed by Simon Glass
parent 9d019f5106
commit e023b8601e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/fdt.c
View File

@@ -611,6 +611,10 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
} else if (strncmp(argv[1], "me", 2) == 0) { } else if (strncmp(argv[1], "me", 2) == 0) {
uint64_t addr, size; uint64_t addr, size;
int err; int err;
if (argc != 4)
return CMD_RET_USAGE;
addr = simple_strtoull(argv[2], NULL, 16); addr = simple_strtoull(argv[2], NULL, 16);
size = simple_strtoull(argv[3], NULL, 16); size = simple_strtoull(argv[3], NULL, 16);
err = fdt_fixup_memory(working_fdt, addr, size); err = fdt_fixup_memory(working_fdt, addr, size);