mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 09:27:35 +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>
110 lines
3.1 KiB
C
110 lines
3.1 KiB
C
/*
|
|
* (C) Copyright 2000-2002
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* (C) Copyright 2002 (440 port)
|
|
* Scott McNutt, Artesyn Communication Producs, smcnutt@artsyncp.com
|
|
*
|
|
* (C) Copyright 2003 Motorola Inc. (MPC85xx port)
|
|
* Xianghua Xiao (X.Xiao@motorola.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 <watchdog.h>
|
|
#include <command.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/io.h>
|
|
|
|
int interrupt_init_cpu(unsigned int *decrementer_count)
|
|
{
|
|
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC85xx_PIC_ADDR;
|
|
|
|
out_be32(&pic->gcr, MPC85xx_PICGCR_RST);
|
|
while (in_be32(&pic->gcr) & MPC85xx_PICGCR_RST)
|
|
;
|
|
out_be32(&pic->gcr, MPC85xx_PICGCR_M);
|
|
in_be32(&pic->gcr);
|
|
|
|
*decrementer_count = get_tbclk() / CONFIG_SYS_HZ;
|
|
|
|
/* PIE is same as DIE, dec interrupt enable */
|
|
mtspr(SPRN_TCR, TCR_PIE);
|
|
|
|
#ifdef CONFIG_INTERRUPTS
|
|
pic->iivpr1 = 0x810001; /* 50220 enable ecm interrupts */
|
|
debug("iivpr1@%x = %x\n", (uint)&pic->iivpr1, pic->iivpr1);
|
|
|
|
pic->iivpr2 = 0x810002; /* 50240 enable ddr interrupts */
|
|
debug("iivpr2@%x = %x\n", (uint)&pic->iivpr2, pic->iivpr2);
|
|
|
|
pic->iivpr3 = 0x810003; /* 50260 enable lbc interrupts */
|
|
debug("iivpr3@%x = %x\n", (uint)&pic->iivpr3, pic->iivpr3);
|
|
|
|
#ifdef CONFIG_PCI1
|
|
pic->iivpr8 = 0x810008; /* enable pci1 interrupts */
|
|
debug("iivpr8@%x = %x\n", (uint)&pic->iivpr8, pic->iivpr8);
|
|
#endif
|
|
#if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
|
|
pic->iivpr9 = 0x810009; /* enable pci1 interrupts */
|
|
debug("iivpr9@%x = %x\n", (uint)&pic->iivpr9, pic->iivpr9);
|
|
#endif
|
|
#ifdef CONFIG_PCIE1
|
|
pic->iivpr10 = 0x81000a; /* enable pcie1 interrupts */
|
|
debug("iivpr10@%x = %x\n", (uint)&pic->iivpr10, pic->iivpr10);
|
|
#endif
|
|
#ifdef CONFIG_PCIE3
|
|
pic->iivpr11 = 0x81000b; /* enable pcie3 interrupts */
|
|
debug("iivpr11@%x = %x\n", (uint)&pic->iivpr11, pic->iivpr11);
|
|
#endif
|
|
|
|
pic->ctpr=0; /* 40080 clear current task priority register */
|
|
#endif
|
|
|
|
return (0);
|
|
}
|
|
|
|
/* Install and free a interrupt handler. Not implemented yet. */
|
|
|
|
void
|
|
irq_install_handler(int vec, interrupt_handler_t *handler, void *arg)
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
irq_free_handler(int vec)
|
|
{
|
|
return;
|
|
}
|
|
|
|
void timer_interrupt_cpu(struct pt_regs *regs)
|
|
{
|
|
/* PIS is same as DIS, dec interrupt status */
|
|
mtspr(SPRN_TSR, TSR_PIS);
|
|
}
|
|
|
|
#if defined(CONFIG_CMD_IRQ)
|
|
/* irqinfo - print information about PCI devices,not implemented. */
|
|
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|