mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-15 01:03:24 +09: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>
102 lines
2.5 KiB
C
102 lines
2.5 KiB
C
/*
|
|
* (C) Copyright 2007
|
|
* Stefan Roese, DENX Software Engineering, sr@denx.de.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <i2c.h>
|
|
|
|
static u8 boot_267_nor[] = {
|
|
0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0x00,
|
|
0x14, 0xc0, 0x36, 0xcc, 0x00, 0x0c, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00
|
|
};
|
|
|
|
static u8 boot_267_nand[] = {
|
|
0xd0, 0x38, 0xc3, 0x50, 0x13, 0x88, 0x8e, 0x00,
|
|
0x14, 0xc0, 0x36, 0xcc, 0x00, 0x0c, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00
|
|
};
|
|
|
|
static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
u8 chip;
|
|
u8 *buf;
|
|
int cpu_freq;
|
|
|
|
if (argc < 3) {
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
|
|
cpu_freq = simple_strtol(argv[1], NULL, 10);
|
|
if (cpu_freq != 267) {
|
|
printf("Unsupported cpu-frequency - only 267 supported\n");
|
|
return 1;
|
|
}
|
|
|
|
/* use 0x50 as I2C EEPROM address for now */
|
|
chip = 0x50;
|
|
|
|
if ((strcmp(argv[2], "nor") != 0) &&
|
|
(strcmp(argv[2], "nand") != 0)) {
|
|
printf("Unsupported boot-device - only nor|nand support\n");
|
|
return 1;
|
|
}
|
|
|
|
if (strcmp(argv[2], "nand") == 0) {
|
|
switch (cpu_freq) {
|
|
case 267:
|
|
buf = boot_267_nand;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
} else {
|
|
switch (cpu_freq) {
|
|
case 267:
|
|
buf = boot_267_nor;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (i2c_write(chip, 0, 1, buf, 16) != 0)
|
|
printf("Error writing to EEPROM at address 0x%x\n", chip);
|
|
udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
|
|
if (i2c_write(chip, 0x10, 1, buf+16, 4) != 0)
|
|
printf("Error2 writing to EEPROM at address 0x%x\n", chip);
|
|
|
|
printf("Done\n");
|
|
printf("Please power-cycle the board for the changes to take effect\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
bootstrap, 3, 0, do_bootstrap,
|
|
"program the I2C bootstrap EEPROM",
|
|
"<cpu-freq> <nor|nand> - program the I2C bootstrap EEPROM"
|
|
);
|