mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-31 03:58:17 +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>
154 lines
3.9 KiB
C
154 lines
3.9 KiB
C
/*
|
|
* (C) Copyright 2002
|
|
* Stäubli Faverges - <www.staubli.com>
|
|
* Pierre AUBERT p.aubert@staubli.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
|
|
*/
|
|
|
|
/*
|
|
* Dos floppy support
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <command.h>
|
|
#include <fdc.h>
|
|
|
|
/*-----------------------------------------------------------------------------
|
|
* do_fdosboot --
|
|
*-----------------------------------------------------------------------------
|
|
*/
|
|
int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
char *name;
|
|
char *ep;
|
|
int size;
|
|
int rcode = 0;
|
|
char buf [12];
|
|
int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
|
|
|
|
/* pre-set load_addr */
|
|
if ((ep = getenv("loadaddr")) != NULL) {
|
|
load_addr = simple_strtoul(ep, NULL, 16);
|
|
}
|
|
|
|
/* pre-set Boot file name */
|
|
if ((name = getenv("bootfile")) == NULL) {
|
|
name = "uImage";
|
|
}
|
|
|
|
switch (argc) {
|
|
case 1:
|
|
break;
|
|
case 2:
|
|
/* only one arg - accept two forms:
|
|
* just load address, or just boot file name.
|
|
* The latter form must be written "filename" here.
|
|
*/
|
|
if (argv[1][0] == '"') { /* just boot filename */
|
|
name = argv [1];
|
|
} else { /* load address */
|
|
load_addr = simple_strtoul(argv[1], NULL, 16);
|
|
}
|
|
break;
|
|
case 3:
|
|
load_addr = simple_strtoul(argv[1], NULL, 16);
|
|
name = argv [2];
|
|
break;
|
|
default:
|
|
cmd_usage(cmdtp);
|
|
break;
|
|
}
|
|
|
|
/* Init physical layer */
|
|
if (!fdc_fdos_init (drive)) {
|
|
return (-1);
|
|
}
|
|
|
|
/* Open file */
|
|
if (dos_open (name) < 0) {
|
|
printf ("Unable to open %s\n", name);
|
|
return 1;
|
|
}
|
|
if ((size = dos_read (load_addr)) < 0) {
|
|
printf ("boot error\n");
|
|
return 1;
|
|
}
|
|
flush_cache (load_addr, size);
|
|
|
|
sprintf(buf, "%x", size);
|
|
setenv("filesize", buf);
|
|
|
|
printf("Floppy DOS load complete: %d bytes loaded to 0x%lx\n",
|
|
size, load_addr);
|
|
|
|
/* Check if we should attempt an auto-start */
|
|
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
|
|
char *local_args[2];
|
|
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
|
local_args[0] = argv[0];
|
|
local_args[1] = NULL;
|
|
printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
|
|
rcode = do_bootm (cmdtp, 0, 1, local_args);
|
|
}
|
|
return rcode;
|
|
}
|
|
|
|
/*-----------------------------------------------------------------------------
|
|
* do_fdosls --
|
|
*-----------------------------------------------------------------------------
|
|
*/
|
|
int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
char *path = "";
|
|
int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
|
|
|
|
switch (argc) {
|
|
case 1:
|
|
break;
|
|
case 2:
|
|
path = argv [1];
|
|
break;
|
|
}
|
|
|
|
/* Init physical layer */
|
|
if (!fdc_fdos_init (drive)) {
|
|
return (-1);
|
|
}
|
|
/* Open directory */
|
|
if (dos_open (path) < 0) {
|
|
printf ("Unable to open %s\n", path);
|
|
return 1;
|
|
}
|
|
return (dos_dir ());
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
fdosboot, 3, 0, do_fdosboot,
|
|
"boot from a dos floppy file",
|
|
"[loadAddr] [filename]"
|
|
);
|
|
|
|
U_BOOT_CMD(
|
|
fdosls, 2, 0, do_fdosls,
|
|
"list files in a directory",
|
|
"[directory]"
|
|
);
|