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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
910f66fcda
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue