mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-05 18:56:15 +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>
86 lines
2.3 KiB
C
86 lines
2.3 KiB
C
/*
|
|
* (C) Copyright 2007
|
|
* Stefano Babic, DENX Software Engineering, sbabic@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 <dm9000.h>
|
|
|
|
static int do_read_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
|
|
unsigned int i;
|
|
u8 data[2];
|
|
|
|
for (i=0; i < 0x40; i++) {
|
|
if (!(i % 0x10))
|
|
printf("\n%08x:", i);
|
|
dm9000_read_srom_word(i, data);
|
|
printf(" %02x%02x", data[1], data[0]);
|
|
}
|
|
printf ("\n");
|
|
return (0);
|
|
}
|
|
|
|
static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
|
|
int offset,value;
|
|
|
|
if (argc < 4) {
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
|
|
offset=simple_strtoul(argv[2],NULL,16);
|
|
value=simple_strtoul(argv[3],NULL,16);
|
|
if (offset > 0x40) {
|
|
printf("Wrong offset : 0x%x\n",offset);
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
dm9000_write_srom_word(offset, value);
|
|
return (0);
|
|
}
|
|
|
|
int do_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
|
|
if (argc < 2) {
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
|
|
if (strcmp (argv[1],"read") == 0) {
|
|
return (do_read_dm9000_eeprom(cmdtp,flag,argc,argv));
|
|
} else if (strcmp (argv[1],"write") == 0) {
|
|
return (do_write_dm9000_eeprom(cmdtp,flag,argc,argv));
|
|
} else {
|
|
cmd_usage(cmdtp);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
dm9000ee,4,1,do_dm9000_eeprom,
|
|
"Read/Write eeprom connected to Ethernet Controller",
|
|
"\ndm9000ee write <word offset> <value> \n"
|
|
"\tdm9000ee read \n"
|
|
"\tword:\t\t00-02 : MAC Address\n"
|
|
"\t\t\t03-07 : DM9000 Configuration\n"
|
|
"\t\t\t08-63 : User data"
|
|
);
|