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

nand: fix address overflow 

The shifts of the address mask and value shift beyond 32 bits when there
are 5 address cycles.

Cc: qemu-stable@nongnu.org
Signed-off-by: Rabin Vincent <rabin.vincent@axis.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Rabin Vincent 2015-11-10 14:25:47 +01:00 committed by Kevin Wolf
parent ab9b872ab3
commit a184e74f24
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/block/nand.c
View File

@ -522,8 +522,8 @@ void nand_setio(DeviceState *dev, uint32_t value)
if (s->ale) { if (s->ale) {
unsigned int shift = s->addrlen * 8; unsigned int shift = s->addrlen * 8;
unsigned int mask = ~(0xff << shift); uint64_t mask = ~(0xffull << shift);
unsigned int v = value << shift; uint64_t v = (uint64_t)value << shift;
s->addr = (s->addr & mask) | v; s->addr = (s->addr & mask) | v;
s->addrlen ++; s->addrlen ++;