mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 00:49:43 +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>
194 lines
5 KiB
C
194 lines
5 KiB
C
/*
|
|
* caddy.c -- esd VME8349 support for "missing" access modes in TSI148.
|
|
* Copyright (c) 2009 esd gmbh.
|
|
*
|
|
* Reinhard Arlt <reinhard.arlt@esd-electronics.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 <ioports.h>
|
|
#include <mpc83xx.h>
|
|
#include <asm/mpc8349_pci.h>
|
|
#include <pci.h>
|
|
#include <asm/mmu.h>
|
|
#include <asm/io.h>
|
|
|
|
#include "caddy.h"
|
|
|
|
static struct caddy_interface *caddy_interface;
|
|
|
|
void generate_answer(struct caddy_cmd *cmd, uint32_t status, uint32_t *result)
|
|
{
|
|
struct caddy_answer *answer;
|
|
uint32_t ptr;
|
|
|
|
answer = &caddy_interface->answer[caddy_interface->answer_in];
|
|
memset((void *)answer, 0, sizeof(struct caddy_answer));
|
|
answer->answer = cmd->cmd;
|
|
answer->issue = cmd->issue;
|
|
answer->status = status;
|
|
memcpy(answer->par, result, 5 * sizeof(result[0]));
|
|
ptr = caddy_interface->answer_in + 1;
|
|
ptr = ptr & (ANSWER_SIZE - 1);
|
|
if (ptr != caddy_interface->answer_out)
|
|
caddy_interface->answer_in = ptr;
|
|
}
|
|
|
|
int do_caddy(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
unsigned long base_addr;
|
|
uint32_t ptr;
|
|
struct caddy_cmd *caddy_cmd;
|
|
uint32_t result[5];
|
|
uint16_t data16;
|
|
uint8_t data8;
|
|
uint32_t status;
|
|
pci_dev_t dev;
|
|
void *pci_ptr;
|
|
|
|
if (argc < 2) {
|
|
puts("Missing parameter\n");
|
|
return 1;
|
|
}
|
|
|
|
base_addr = simple_strtoul(argv[1], NULL, 16);
|
|
caddy_interface = (struct caddy_interface *) base_addr;
|
|
|
|
memset((void *)caddy_interface, 0, sizeof(struct caddy_interface));
|
|
memcpy((void *)&caddy_interface->magic[0], &CADDY_MAGIC, 16);
|
|
|
|
while (ctrlc() == 0) {
|
|
if (caddy_interface->cmd_in != caddy_interface->cmd_out) {
|
|
memset(result, 0, 5 * sizeof(result[0]));
|
|
status = 0;
|
|
caddy_cmd = &caddy_interface->cmd[caddy_interface->cmd_out];
|
|
pci_ptr = (void *)CONFIG_SYS_PCI1_IO_PHYS +
|
|
(caddy_cmd->addr & 0x001fffff);
|
|
|
|
switch (caddy_cmd->cmd) {
|
|
case CADDY_CMD_IO_READ_8:
|
|
result[0] = in_8(pci_ptr);
|
|
break;
|
|
|
|
case CADDY_CMD_IO_READ_16:
|
|
result[0] = in_be16(pci_ptr);
|
|
break;
|
|
|
|
case CADDY_CMD_IO_READ_32:
|
|
result[0] = in_be32(pci_ptr);
|
|
break;
|
|
|
|
case CADDY_CMD_IO_WRITE_8:
|
|
data8 = caddy_cmd->par[0] & 0x000000ff;
|
|
out_8(pci_ptr, data8);
|
|
break;
|
|
|
|
case CADDY_CMD_IO_WRITE_16:
|
|
data16 = caddy_cmd->par[0] & 0x0000ffff;
|
|
out_be16(pci_ptr, data16);
|
|
break;
|
|
|
|
case CADDY_CMD_IO_WRITE_32:
|
|
out_be32(pci_ptr, caddy_cmd->par[0]);
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_READ_8:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
status = pci_read_config_byte(dev,
|
|
caddy_cmd->addr,
|
|
&data8);
|
|
result[0] = data8;
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_READ_16:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
status = pci_read_config_word(dev,
|
|
caddy_cmd->addr,
|
|
&data16);
|
|
result[0] = data16;
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_READ_32:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
status = pci_read_config_dword(dev,
|
|
caddy_cmd->addr,
|
|
&result[0]);
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_WRITE_8:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
data8 = caddy_cmd->par[3] & 0x000000ff;
|
|
status = pci_write_config_byte(dev,
|
|
caddy_cmd->addr,
|
|
data8);
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_WRITE_16:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
data16 = caddy_cmd->par[3] & 0x0000ffff;
|
|
status = pci_write_config_word(dev,
|
|
caddy_cmd->addr,
|
|
data16);
|
|
break;
|
|
|
|
case CADDY_CMD_CONFIG_WRITE_32:
|
|
dev = PCI_BDF(caddy_cmd->par[0],
|
|
caddy_cmd->par[1],
|
|
caddy_cmd->par[2]);
|
|
status = pci_write_config_dword(dev,
|
|
caddy_cmd->addr,
|
|
caddy_cmd->par[3]);
|
|
break;
|
|
|
|
default:
|
|
status = 0xffffffff;
|
|
break;
|
|
}
|
|
|
|
generate_answer(caddy_cmd, status, &result[0]);
|
|
|
|
ptr = caddy_interface->cmd_out + 1;
|
|
ptr = ptr & (CMD_SIZE - 1);
|
|
caddy_interface->cmd_out = ptr;
|
|
}
|
|
|
|
caddy_interface->heartbeat++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
caddy, 2, 0, do_caddy,
|
|
"Start Caddy server.",
|
|
"Start Caddy server with Data structure a given addr\n"
|
|
);
|