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>
64 lines
1.2 KiB
C
64 lines
1.2 KiB
C
/*
|
|
* U-boot - boot.c - misc boot helper functions
|
|
*
|
|
* Copyright (c) 2005-2008 Analog Devices Inc.
|
|
*
|
|
* (C) Copyright 2000-2004
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <asm/blackfin.h>
|
|
|
|
#ifdef SHARED_RESOURCES
|
|
extern void swap_to(int device_id);
|
|
#endif
|
|
|
|
static char *make_command_line(void)
|
|
{
|
|
char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR;
|
|
char *bootargs = getenv("bootargs");
|
|
|
|
if (bootargs == NULL)
|
|
return NULL;
|
|
|
|
strncpy(dest, bootargs, CONFIG_LINUX_CMDLINE_SIZE);
|
|
dest[CONFIG_LINUX_CMDLINE_SIZE - 1] = 0;
|
|
return dest;
|
|
}
|
|
|
|
extern ulong bfin_poweron_retx;
|
|
|
|
int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
|
|
{
|
|
int (*appl) (char *cmdline);
|
|
char *cmdline;
|
|
|
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
|
return 1;
|
|
|
|
#ifdef SHARED_RESOURCES
|
|
swap_to(FLASH);
|
|
#endif
|
|
|
|
appl = (int (*)(char *))images->ep;
|
|
|
|
printf("Starting Kernel at = %p\n", appl);
|
|
cmdline = make_command_line();
|
|
icache_disable();
|
|
dcache_disable();
|
|
asm __volatile__(
|
|
"RETX = %[retx];"
|
|
"CALL (%0);"
|
|
:
|
|
: "p"(appl), "q0"(cmdline), [retx] "d"(bfin_poweron_retx)
|
|
);
|
|
/* does not return */
|
|
|
|
return 1;
|
|
}
|