mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-04 05:50: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>
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
/*
|
|
* (C) Copyright 2007 Michal Simek
|
|
* (C) Copyright 2004 Atmark Techno, Inc.
|
|
*
|
|
* Michal SIMEK <monstr@monstr.eu>
|
|
* Yasushi SHOJI <yashi@atmark-techno.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
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <u-boot/zlib.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
|
|
{
|
|
/* First parameter is mapped to $r5 for kernel boot args */
|
|
void (*theKernel) (char *, ulong, ulong);
|
|
char *commandline = getenv ("bootargs");
|
|
ulong rd_data_start, rd_data_end;
|
|
|
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
|
return 1;
|
|
|
|
int ret;
|
|
|
|
char *of_flat_tree = NULL;
|
|
#if defined(CONFIG_OF_LIBFDT)
|
|
ulong of_size = 0;
|
|
|
|
/* find flattened device tree */
|
|
ret = boot_get_fdt (flag, argc, argv, images, &of_flat_tree, &of_size);
|
|
if (ret)
|
|
return 1;
|
|
#endif
|
|
|
|
theKernel = (void (*)(char *, ulong, ulong))images->ep;
|
|
|
|
/* find ramdisk */
|
|
ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE,
|
|
&rd_data_start, &rd_data_end);
|
|
if (ret)
|
|
return 1;
|
|
|
|
show_boot_progress (15);
|
|
|
|
if (!(ulong) of_flat_tree)
|
|
of_flat_tree = (char *)simple_strtoul (argv[3], NULL, 16);
|
|
|
|
#ifdef DEBUG
|
|
printf ("## Transferring control to Linux (at address 0x%08lx) " \
|
|
"ramdisk 0x%08lx, FDT 0x%08lx...\n",
|
|
(ulong) theKernel, rd_data_start, (ulong) of_flat_tree);
|
|
#endif
|
|
|
|
#ifdef XILINX_USE_DCACHE
|
|
#ifdef XILINX_DCACHE_BYTE_SIZE
|
|
flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
|
|
#else
|
|
#warning please rebuild BSPs and update configuration
|
|
flush_cache(0, 32768);
|
|
#endif
|
|
#endif
|
|
/*
|
|
* Linux Kernel Parameters (passing device tree):
|
|
* r5: pointer to command line
|
|
* r6: pointer to ramdisk
|
|
* r7: pointer to the fdt, followed by the board info data
|
|
*/
|
|
theKernel (commandline, rd_data_start, (ulong) of_flat_tree);
|
|
/* does not return */
|
|
|
|
return 1;
|
|
}
|