mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-27 01:58:19 +00:00
54841ab50c
The hush shell dynamically allocates (and re-allocates) memory for the
argument strings in the "char *argv[]" argument vector passed to
commands. Any code that modifies these pointers will cause serious
corruption of the malloc data structures and crash U-Boot, so make
sure the compiler can check that no such modifications are being done
by changing the code into "char * const argv[]".
This modification is the result of debugging a strange crash caused
after adding a new command, which used the following argument
processing code which has been working perfectly fine in all Unix
systems since version 6 - but not so in U-Boot:
int main (int argc, char **argv)
{
while (--argc > 0 && **++argv == '-') {
/* ====> */ while (*++*argv) {
switch (**argv) {
case 'd':
debug++;
break;
...
default:
usage ();
}
}
}
...
}
The line marked "====>" will corrupt the malloc data structures and
usually cause U-Boot to crash when the next command gets executed by
the shell. With the modification, the compiler will prevent this with
an
error: increment of read-only location '*argv'
N.B.: The code above can be trivially rewritten like this:
while (--argc > 0 && **++argv == '-') {
char *arg = *argv;
while (*++arg) {
switch (*arg) {
...
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
38 lines
616 B
C
38 lines
616 B
C
/*
|
|
* Command for accessing DataFlash.
|
|
*
|
|
* Copyright (C) 2008 Atmel Corporation
|
|
*/
|
|
#include <common.h>
|
|
#include <df.h>
|
|
|
|
static int do_df(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
const char *cmd;
|
|
|
|
/* need at least two arguments */
|
|
if (argc < 2)
|
|
goto usage;
|
|
|
|
cmd = argv[1];
|
|
|
|
if (strcmp(cmd, "init") == 0) {
|
|
df_init(0, 0, 1000000);
|
|
return 0;
|
|
}
|
|
|
|
if (strcmp(cmd, "info") == 0) {
|
|
df_show_info();
|
|
return 0;
|
|
}
|
|
|
|
usage:
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
sf, 2, 1, do_serial_flash,
|
|
"Serial flash sub-system",
|
|
"probe [bus:]cs - init flash device on given SPI bus and CS")
|