Skip to content

Commit

Permalink
hw/pci-host/bonito: Avoid buffer overrun for bad LDMA/COP accesses
Browse files Browse the repository at this point in the history
The LDMA and COP memory regions represent four 32 bit registers
each, but the memory regions themselves are 0x100 bytes large.
Add guards to the read and write accessors so that bogus accesses
beyond the four defined registers don't just run off the end of
the bonldma and boncop structs and into whatever lies beyond.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
  • Loading branch information
pm215 authored and Leon Alrae committed Aug 13, 2015
1 parent eb02cc3 commit 58d4797
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions hw/pci-host/bonito.c
Expand Up @@ -355,6 +355,10 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr addr,
uint32_t val;
PCIBonitoState *s = opaque;

if (addr >= sizeof(s->bonldma)) {
return 0;
}

val = ((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)];

return val;
Expand All @@ -365,6 +369,10 @@ static void bonito_ldma_writel(void *opaque, hwaddr addr,
{
PCIBonitoState *s = opaque;

if (addr >= sizeof(s->bonldma)) {
return;
}

((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)] = val & 0xffffffff;
}

Expand All @@ -384,6 +392,10 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr addr,
uint32_t val;
PCIBonitoState *s = opaque;

if (addr >= sizeof(s->boncop)) {
return 0;
}

val = ((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)];

return val;
Expand All @@ -394,6 +406,10 @@ static void bonito_cop_writel(void *opaque, hwaddr addr,
{
PCIBonitoState *s = opaque;

if (addr >= sizeof(s->boncop)) {
return;
}

((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)] = val & 0xffffffff;
}

Expand Down

0 comments on commit 58d4797

Please sign in to comment.