OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc/e500_pci: Fix an array overflow issue 

When access PPCE500_PCI_IW1 the previous index get overflow.
The patch fix the issue and update all to keep consistent style.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Liu Yu-B13201 2011-09-29 17:52:50 +00:00 committed by Alexander Graf
parent 6875dc8ea4
commit eeae2e7b52
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/ppce500_pci.c
View File

@ -89,6 +89,7 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
PPCE500PCIState *pci = opaque; PPCE500PCIState *pci = opaque;
unsigned long win; unsigned long win;
uint32_t value = 0; uint32_t value = 0;
int idx;
win = addr & 0xfe0; win = addr & 0xfe0;
@ -97,18 +98,19 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_OW2: case PPCE500_PCI_OW2:
case PPCE500_PCI_OW3: case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4: case PPCE500_PCI_OW4:
idx = (addr >> 5) & 0x7;
switch (addr & 0xC) { switch (addr & 0xC) {
case PCI_POTAR: case PCI_POTAR:
value = pci->pob[(addr >> 5) & 0x7].potar; value = pci->pob[idx].potar;
break; break;
case PCI_POTEAR: case PCI_POTEAR:
value = pci->pob[(addr >> 5) & 0x7].potear; value = pci->pob[idx].potear;
break; break;
case PCI_POWBAR: case PCI_POWBAR:
value = pci->pob[(addr >> 5) & 0x7].powbar; value = pci->pob[idx].powbar;
break; break;
case PCI_POWAR: case PCI_POWAR:
value = pci->pob[(addr >> 5) & 0x7].powar; value = pci->pob[idx].powar;
break; break;
default: default:
break; break;
@ -118,18 +120,19 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_IW3: case PPCE500_PCI_IW3:
case PPCE500_PCI_IW2: case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1: case PPCE500_PCI_IW1:
idx = ((addr >> 5) & 0x3) - 1;
switch (addr & 0xC) { switch (addr & 0xC) {
case PCI_PITAR: case PCI_PITAR:
value = pci->pib[(addr >> 5) & 0x3].pitar; value = pci->pib[idx].pitar;
break; break;
case PCI_PIWBAR: case PCI_PIWBAR:
value = pci->pib[(addr >> 5) & 0x3].piwbar; value = pci->pib[idx].piwbar;
break; break;
case PCI_PIWBEAR: case PCI_PIWBEAR:
value = pci->pib[(addr >> 5) & 0x3].piwbear; value = pci->pib[idx].piwbear;
break; break;
case PCI_PIWAR: case PCI_PIWAR:
value = pci->pib[(addr >> 5) & 0x3].piwar; value = pci->pib[idx].piwar;
break; break;
default: default:
break; break;
@ -160,6 +163,7 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
{ {
PPCE500PCIState *pci = opaque; PPCE500PCIState *pci = opaque;
unsigned long win; unsigned long win;
int idx;
win = addr & 0xfe0; win = addr & 0xfe0;
@ -171,18 +175,19 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_OW2: case PPCE500_PCI_OW2:
case PPCE500_PCI_OW3: case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4: case PPCE500_PCI_OW4:
idx = (addr >> 5) & 0x7;
switch (addr & 0xC) { switch (addr & 0xC) {
case PCI_POTAR: case PCI_POTAR:
pci->pob[(addr >> 5) & 0x7].potar = value; pci->pob[idx].potar = value;
break; break;
case PCI_POTEAR: case PCI_POTEAR:
pci->pob[(addr >> 5) & 0x7].potear = value; pci->pob[idx].potear = value;
break; break;
case PCI_POWBAR: case PCI_POWBAR:
pci->pob[(addr >> 5) & 0x7].powbar = value; pci->pob[idx].powbar = value;
break; break;
case PCI_POWAR: case PCI_POWAR:
pci->pob[(addr >> 5) & 0x7].powar = value; pci->pob[idx].powar = value;
break; break;
default: default:
break; break;
@ -192,18 +197,19 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_IW3: case PPCE500_PCI_IW3:
case PPCE500_PCI_IW2: case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1: case PPCE500_PCI_IW1:
idx = ((addr >> 5) & 0x3) - 1;
switch (addr & 0xC) { switch (addr & 0xC) {
case PCI_PITAR: case PCI_PITAR:
pci->pib[(addr >> 5) & 0x3].pitar = value; pci->pib[idx].pitar = value;
break; break;
case PCI_PIWBAR: case PCI_PIWBAR:
pci->pib[(addr >> 5) & 0x3].piwbar = value; pci->pib[idx].piwbar = value;
break; break;
case PCI_PIWBEAR: case PCI_PIWBEAR:
pci->pib[(addr >> 5) & 0x3].piwbear = value; pci->pib[idx].piwbear = value;
break; break;
case PCI_PIWAR: case PCI_PIWAR:
pci->pib[(addr >> 5) & 0x3].piwar = value; pci->pib[idx].piwar = value;
break; break;
default: default:
break; break;