From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz5IH-0003JR-0f for qemu-devel@nongnu.org; Wed, 18 Nov 2015 11:09:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz5IF-0007PF-No for qemu-devel@nongnu.org; Wed, 18 Nov 2015 11:09:12 -0500 From: Kevin Wolf Date: Wed, 18 Nov 2015 17:09:00 +0100 Message-Id: <1447862943-16071-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1447862943-16071-1-git-send-email-kwolf@redhat.com> References: <1447862943-16071-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 1/4] nand: fix address overflow List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Rabin Vincent 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 Reviewed-by: Paolo Bonzini Reviewed-by: Peter Crosthwaite Signed-off-by: Kevin Wolf --- 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