Commit 910f66fc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging 



* remotes/mcayland/qemu-sparc:
  apb: Fix out-of-bounds array write access

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 337b172b 68716da7

hw/pci-host/apb.c

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static void iommu_config_write(void *opaque, hwaddr addr, 
            is->regs[IOMMU_CTRL >> 3] &= 0xffffffffULL;

            is->regs[IOMMU_CTRL >> 3] |= val << 32;

        } else {

            is->regs[IOMMU_CTRL] = val;

            is->regs[IOMMU_CTRL >> 3] = val;

        }

        break;

    case IOMMU_CTRL + 0x4:
@@ -345,7 +345,7 @@ static void iommu_config_write(void *opaque, hwaddr addr, 
            is->regs[IOMMU_BASE >> 3] &= 0xffffffffULL;

            is->regs[IOMMU_BASE >> 3] |= val << 32;

        } else {

            is->regs[IOMMU_BASE] = val;

            is->regs[IOMMU_BASE >> 3] = val;

        }

        break;

    case IOMMU_BASE + 0x4: