Skip to content

Commit

Permalink
MIPS: TXx9: Make firmware parameter passing more robust
Browse files Browse the repository at this point in the history
When booting Linux on a txx9 board with VxWorks boot loader, it crashes in
prom_getenv(), as VxWorks doesn't pass firmware parameters in a0-a3 (in my
case, the actual leftover values in these registers were 0x80002000,
0x80001fe0, 0x2000, and 0x20).

Make the parsing of argc, argv, and envp a bit more robust by checking if
argc is a number below CKSEG0, and argv/envp point to CKSEG0.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Geert Uytterhoeven authored and Ralf Baechle committed Oct 27, 2008
1 parent d1a8e2a commit 97b0511
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions arch/mips/txx9/generic/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,23 @@ static struct txx9_board_vec *__init find_board_byname(const char *name)

static void __init prom_init_cmdline(void)
{
int argc = (int)fw_arg0;
int *argv32 = (int *)fw_arg1;
int argc;
int *argv32;
int i; /* Always ignore the "-c" at argv[0] */
char builtin[CL_SIZE];

if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) {
/*
* argc is not a valid number, or argv32 is not a valid
* pointer
*/
argc = 0;
argv32 = NULL;
} else {
argc = (int)fw_arg0;
argv32 = (int *)fw_arg1;
}

/* ignore all built-in args if any f/w args given */
/*
* But if built-in strings was started with '+', append them
Expand Down Expand Up @@ -414,10 +426,12 @@ char * __init prom_getcmdline(void)

const char *__init prom_getenv(const char *name)
{
const s32 *str = (const s32 *)fw_arg2;
const s32 *str;

if (!str)
if (fw_arg2 < CKSEG0)
return NULL;

str = (const s32 *)fw_arg2;
/* YAMON style ("name", "value" pairs) */
while (str[0] && str[1]) {
if (!strcmp((const char *)(unsigned long)str[0], name))
Expand Down

0 comments on commit 97b0511

Please sign in to comment.