mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +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>
114 lines
2.6 KiB
C
114 lines
2.6 KiB
C
/*
|
|
* (C) Copyright 2002-2004
|
|
* Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
|
|
*
|
|
* 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 <malloc.h>
|
|
#include <net.h>
|
|
#include <asm/io.h>
|
|
#include <pci.h>
|
|
#include <asm/4xx_pci.h>
|
|
#include <asm/processor.h>
|
|
|
|
#include "pci405.h"
|
|
|
|
#if defined(CONFIG_CMD_BSP)
|
|
|
|
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
|
|
|
/*
|
|
* Command loadpci: wait for signal from host and boot image.
|
|
*/
|
|
int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
unsigned int *ptr = 0;
|
|
int count = 0;
|
|
int count2 = 0;
|
|
int status;
|
|
int i;
|
|
char addr[16];
|
|
char str[] = "\\|/-";
|
|
char *local_args[2];
|
|
|
|
/*
|
|
* Mark sync address
|
|
*/
|
|
ptr = 0;
|
|
*ptr = 0xffffffff;
|
|
puts("\nWaiting for image from pci host -");
|
|
|
|
/*
|
|
* Wait for host to write the start address
|
|
*/
|
|
while (*ptr == 0xffffffff) {
|
|
count++;
|
|
if (!(count % 100)) {
|
|
count2++;
|
|
putc(0x08); /* backspace */
|
|
putc(str[count2 % 4]);
|
|
}
|
|
|
|
/* Abort if ctrl-c was pressed */
|
|
if (ctrlc()) {
|
|
puts("\nAbort\n");
|
|
return 0;
|
|
}
|
|
|
|
udelay(1000);
|
|
}
|
|
|
|
if (*ptr == PCI_RECONFIG_MAGIC) {
|
|
/*
|
|
* Save own pci configuration in PRAM
|
|
*/
|
|
memset((char *)PCI_REGS_ADDR, 0, PCI_REGS_LEN);
|
|
ptr = (unsigned int *)PCI_REGS_ADDR + 1;
|
|
for (i=0; i<0x40; i+=4) {
|
|
pci_read_config_dword(PCIDEVID_405GP, i, ptr++);
|
|
}
|
|
ptr = (unsigned int *)PCI_REGS_ADDR;
|
|
*ptr = crc32(0, (uchar *)PCI_REGS_ADDR+4, PCI_REGS_LEN-4);
|
|
|
|
printf("\nStoring PCI Configuration Regs...\n");
|
|
} else {
|
|
sprintf(addr, "%08x", *ptr);
|
|
|
|
/*
|
|
* Boot image via bootm
|
|
*/
|
|
printf("\nBooting Image at addr 0x%s ...\n", addr);
|
|
setenv("loadaddr", addr);
|
|
|
|
local_args[0] = argv[0];
|
|
local_args[1] = NULL;
|
|
status = do_bootm (cmdtp, 0, 1, local_args);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
U_BOOT_CMD(
|
|
loadpci, 1, 1, do_loadpci,
|
|
"Wait for pci-image and boot it",
|
|
""
|
|
);
|
|
#endif
|