[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/4] nand: fix address overflow
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 1/4] nand: fix address overflow |
Date: |
Wed, 18 Nov 2015 17:09:00 +0100 |
From: Rabin Vincent <address@hidden>
The shifts of the address mask and value shift beyond 32 bits when there
are 5 address cycles.
Cc: address@hidden
Signed-off-by: Rabin Vincent <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/block/nand.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 61d2cec..a68266f 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -522,8 +522,8 @@ void nand_setio(DeviceState *dev, uint32_t value)
if (s->ale) {
unsigned int shift = s->addrlen * 8;
- unsigned int mask = ~(0xff << shift);
- unsigned int v = value << shift;
+ uint64_t mask = ~(0xffull << shift);
+ uint64_t v = (uint64_t)value << shift;
s->addr = (s->addr & mask) | v;
s->addrlen ++;
--
1.8.3.1