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>
217 lines
5.4 KiB
C
217 lines
5.4 KiB
C
/*
|
|
* 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
|
|
*
|
|
* based on: cmd_jffs2.c
|
|
*
|
|
* Add support for a CRAMFS located in RAM
|
|
*/
|
|
|
|
|
|
/*
|
|
* CRAMFS support
|
|
*/
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <malloc.h>
|
|
#include <linux/list.h>
|
|
#include <linux/ctype.h>
|
|
#include <jffs2/jffs2.h>
|
|
#include <jffs2/load_kernel.h>
|
|
#include <cramfs/cramfs_fs.h>
|
|
|
|
/* enable/disable debugging messages */
|
|
#define DEBUG_CRAMFS
|
|
#undef DEBUG_CRAMFS
|
|
|
|
#ifdef DEBUG_CRAMFS
|
|
# define DEBUGF(fmt, args...) printf(fmt ,##args)
|
|
#else
|
|
# define DEBUGF(fmt, args...)
|
|
#endif
|
|
|
|
#ifdef CONFIG_CRAMFS_CMDLINE
|
|
flash_info_t flash_info[1];
|
|
|
|
#ifndef CONFIG_CMD_JFFS2
|
|
#include <linux/stat.h>
|
|
char *mkmodestr(unsigned long mode, char *str)
|
|
{
|
|
static const char *l = "xwr";
|
|
int mask = 1, i;
|
|
char c;
|
|
|
|
switch (mode & S_IFMT) {
|
|
case S_IFDIR: str[0] = 'd'; break;
|
|
case S_IFBLK: str[0] = 'b'; break;
|
|
case S_IFCHR: str[0] = 'c'; break;
|
|
case S_IFIFO: str[0] = 'f'; break;
|
|
case S_IFLNK: str[0] = 'l'; break;
|
|
case S_IFSOCK: str[0] = 's'; break;
|
|
case S_IFREG: str[0] = '-'; break;
|
|
default: str[0] = '?';
|
|
}
|
|
|
|
for(i = 0; i < 9; i++) {
|
|
c = l[i%3];
|
|
str[9-i] = (mode & mask)?c:'-';
|
|
mask = mask<<1;
|
|
}
|
|
|
|
if(mode & S_ISUID) str[3] = (mode & S_IXUSR)?'s':'S';
|
|
if(mode & S_ISGID) str[6] = (mode & S_IXGRP)?'s':'S';
|
|
if(mode & S_ISVTX) str[9] = (mode & S_IXOTH)?'t':'T';
|
|
str[10] = '\0';
|
|
return str;
|
|
}
|
|
#endif /* CONFIG_CMD_JFFS2 */
|
|
|
|
extern int cramfs_check (struct part_info *info);
|
|
extern int cramfs_load (char *loadoffset, struct part_info *info, char *filename);
|
|
extern int cramfs_ls (struct part_info *info, char *filename);
|
|
extern int cramfs_info (struct part_info *info);
|
|
|
|
/***************************************************/
|
|
/* U-boot commands */
|
|
/***************************************************/
|
|
|
|
/**
|
|
* Routine implementing fsload u-boot command. This routine tries to load
|
|
* a requested file from cramfs filesystem at location 'cramfsaddr'.
|
|
* cramfsaddr is an evironment variable.
|
|
*
|
|
* @param cmdtp command internal data
|
|
* @param flag command flag
|
|
* @param argc number of arguments supplied to the command
|
|
* @param argv arguments list
|
|
* @return 0 on success, 1 otherwise
|
|
*/
|
|
int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
char *filename;
|
|
int size;
|
|
ulong offset = load_addr;
|
|
|
|
struct part_info part;
|
|
struct mtd_device dev;
|
|
struct mtdids id;
|
|
|
|
ulong addr;
|
|
addr = simple_strtoul(getenv("cramfsaddr"), NULL, 16);
|
|
|
|
/* hack! */
|
|
/* cramfs_* only supports NOR flash chips */
|
|
/* fake the device type */
|
|
id.type = MTD_DEV_TYPE_NOR;
|
|
id.num = 0;
|
|
dev.id = &id;
|
|
part.dev = &dev;
|
|
/* fake the address offset */
|
|
part.offset = addr - flash_info[id.num].start[0];
|
|
|
|
/* pre-set Boot file name */
|
|
if ((filename = getenv("bootfile")) == NULL) {
|
|
filename = "uImage";
|
|
}
|
|
|
|
if (argc == 2) {
|
|
filename = argv[1];
|
|
}
|
|
if (argc == 3) {
|
|
offset = simple_strtoul(argv[1], NULL, 0);
|
|
load_addr = offset;
|
|
filename = argv[2];
|
|
}
|
|
|
|
size = 0;
|
|
if (cramfs_check(&part))
|
|
size = cramfs_load ((char *) offset, &part, filename);
|
|
|
|
if (size > 0) {
|
|
char buf[10];
|
|
printf("### CRAMFS load complete: %d bytes loaded to 0x%lx\n",
|
|
size, offset);
|
|
sprintf(buf, "%x", size);
|
|
setenv("filesize", buf);
|
|
} else {
|
|
printf("### CRAMFS LOAD ERROR<%x> for %s!\n", size, filename);
|
|
}
|
|
|
|
return !(size > 0);
|
|
}
|
|
|
|
/**
|
|
* Routine implementing u-boot ls command which lists content of a given
|
|
* directory at location 'cramfsaddr'.
|
|
* cramfsaddr is an evironment variable.
|
|
*
|
|
* @param cmdtp command internal data
|
|
* @param flag command flag
|
|
* @param argc number of arguments supplied to the command
|
|
* @param argv arguments list
|
|
* @return 0 on success, 1 otherwise
|
|
*/
|
|
int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
char *filename = "/";
|
|
int ret;
|
|
struct part_info part;
|
|
struct mtd_device dev;
|
|
struct mtdids id;
|
|
|
|
ulong addr;
|
|
addr = simple_strtoul(getenv("cramfsaddr"), NULL, 16);
|
|
|
|
/* hack! */
|
|
/* cramfs_* only supports NOR flash chips */
|
|
/* fake the device type */
|
|
id.type = MTD_DEV_TYPE_NOR;
|
|
id.num = 0;
|
|
dev.id = &id;
|
|
part.dev = &dev;
|
|
/* fake the address offset */
|
|
part.offset = addr - flash_info[id.num].start[0];
|
|
|
|
if (argc == 2)
|
|
filename = argv[1];
|
|
|
|
ret = 0;
|
|
if (cramfs_check(&part))
|
|
ret = cramfs_ls (&part, filename);
|
|
|
|
return ret ? 0 : 1;
|
|
}
|
|
|
|
/* command line only */
|
|
|
|
/***************************************************/
|
|
U_BOOT_CMD(
|
|
cramfsload, 3, 0, do_cramfs_load,
|
|
"cramfsload\t- load binary file from a filesystem image",
|
|
"[ off ] [ filename ]\n"
|
|
" - load binary file from address 'cramfsaddr'\n"
|
|
" with offset 'off'\n"
|
|
);
|
|
U_BOOT_CMD(
|
|
cramfsls, 2, 1, do_cramfs_ls,
|
|
"cramfsls\t- list files in a directory (default /)",
|
|
"[ directory ]\n"
|
|
" - list files in a directory.\n"
|
|
);
|
|
|
|
#endif /* #ifdef CONFIG_CRAMFS_CMDLINE */
|
|
|
|
/***************************************************/
|