ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Peter Maydell 2014-06-23 12:40:39 +01:00
parent 337b172bb9 68716da745
commit 910f66fcda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/pci-host/apb.c
View File

@ -333,7 +333,7 @@ static void iommu_config_write(void *opaque, hwaddr addr,
is->regs[IOMMU_CTRL >> 3] &= 0xffffffffULL; is->regs[IOMMU_CTRL >> 3] &= 0xffffffffULL;
is->regs[IOMMU_CTRL >> 3] |= val << 32; is->regs[IOMMU_CTRL >> 3] |= val << 32;
} else { } else {
is->regs[IOMMU_CTRL] = val; is->regs[IOMMU_CTRL >> 3] = val;
} }
break; break;
case IOMMU_CTRL + 0x4: 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] &= 0xffffffffULL;
is->regs[IOMMU_BASE >> 3] |= val << 32; is->regs[IOMMU_BASE >> 3] |= val << 32;
} else { } else {
is->regs[IOMMU_BASE] = val; is->regs[IOMMU_BASE >> 3] = val;
} }
break; break;
case IOMMU_BASE + 0x4: case IOMMU_BASE + 0x4: