mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-02 09:30:10 +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>
161 lines
3.8 KiB
C
161 lines
3.8 KiB
C
/*
|
|
* (C) Copyright 2009
|
|
* Graeme Russ, graeme.russ@gmail.com
|
|
*
|
|
* (C) Copyright 2007
|
|
* Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
|
|
*
|
|
* (C) Copyright 2006
|
|
* Detlev Zundel, DENX Software Engineering, dzu@denx.de
|
|
*
|
|
* (C) Copyright -2003
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* (C) Copyright 2002
|
|
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
|
|
*
|
|
* (C) Copyright 2001
|
|
* Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/*
|
|
* This file contains the high-level API for the interrupt sub-system
|
|
* of the i386 port of U-Boot. Most of the functionality has been
|
|
* shamelessly stolen from the leon2 / leon3 ports of U-Boot.
|
|
* Daniel Hellstrom, Detlev Zundel, Wolfgang Denk and Josh Huber are
|
|
* credited for the corresponding work on those ports. The original
|
|
* interrupt handling routines for the i386 port were written by
|
|
* Daniel Engström
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <asm/interrupt.h>
|
|
|
|
struct irq_action {
|
|
interrupt_handler_t *handler;
|
|
void *arg;
|
|
unsigned int count;
|
|
};
|
|
|
|
static struct irq_action irq_handlers[CONFIG_SYS_NUM_IRQS] = { {0} };
|
|
static int spurious_irq_cnt = 0;
|
|
static int spurious_irq = 0;
|
|
|
|
void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
|
|
{
|
|
int status;
|
|
|
|
if (irq < 0 || irq >= CONFIG_SYS_NUM_IRQS) {
|
|
printf("irq_install_handler: bad irq number %d\n", irq);
|
|
return;
|
|
}
|
|
|
|
if (irq_handlers[irq].handler != NULL)
|
|
printf("irq_install_handler: 0x%08lx replacing 0x%08lx\n",
|
|
(ulong) handler,
|
|
(ulong) irq_handlers[irq].handler);
|
|
|
|
status = disable_interrupts ();
|
|
|
|
irq_handlers[irq].handler = handler;
|
|
irq_handlers[irq].arg = arg;
|
|
irq_handlers[irq].count = 0;
|
|
|
|
unmask_irq(irq);
|
|
|
|
if (status)
|
|
enable_interrupts();
|
|
|
|
return;
|
|
}
|
|
|
|
void irq_free_handler(int irq)
|
|
{
|
|
int status;
|
|
|
|
if (irq < 0 || irq >= CONFIG_SYS_NUM_IRQS) {
|
|
printf("irq_free_handler: bad irq number %d\n", irq);
|
|
return;
|
|
}
|
|
|
|
status = disable_interrupts ();
|
|
|
|
mask_irq(irq);
|
|
|
|
irq_handlers[irq].handler = NULL;
|
|
irq_handlers[irq].arg = NULL;
|
|
|
|
if (status)
|
|
enable_interrupts();
|
|
|
|
return;
|
|
}
|
|
|
|
void do_irq(int hw_irq)
|
|
{
|
|
int irq = hw_irq - 0x20;
|
|
|
|
if (irq < 0 || irq >= CONFIG_SYS_NUM_IRQS) {
|
|
printf("do_irq: bad irq number %d\n", irq);
|
|
return;
|
|
}
|
|
|
|
if (irq_handlers[irq].handler) {
|
|
mask_irq(irq);
|
|
|
|
irq_handlers[irq].handler(irq_handlers[irq].arg);
|
|
irq_handlers[irq].count++;
|
|
|
|
unmask_irq(irq);
|
|
specific_eoi(irq);
|
|
|
|
} else {
|
|
if ((irq & 7) != 7) {
|
|
spurious_irq_cnt++;
|
|
spurious_irq = irq;
|
|
}
|
|
}
|
|
}
|
|
|
|
#if defined(CONFIG_CMD_IRQ)
|
|
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
int irq;
|
|
|
|
printf("Spurious IRQ: %u, last unknown IRQ: %d\n",
|
|
spurious_irq_cnt, spurious_irq);
|
|
|
|
printf ("Interrupt-Information:\n");
|
|
printf ("Nr Routine Arg Count\n");
|
|
|
|
for (irq = 0; irq <= CONFIG_SYS_NUM_IRQS; irq++) {
|
|
if (irq_handlers[irq].handler != NULL) {
|
|
printf ("%02d %08lx %08lx %d\n",
|
|
irq,
|
|
(ulong)irq_handlers[irq].handler,
|
|
(ulong)irq_handlers[irq].arg,
|
|
irq_handlers[irq].count);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|