From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4A9W-0001x5-Nt for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:21:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4A9V-0006ze-VS for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:21:10 -0500 From: Kevin Wolf Date: Wed, 2 Dec 2015 17:20:59 +0100 Message-Id: <1449073260-12483-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1449073260-12483-1-git-send-email-kwolf@redhat.com> References: <1449073260-12483-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 1/2] qcow2: Fix potential qemu-img check crash on 32 bit hosts 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 This crash was caught with qemu-iotests test case 138. Commit b6d36de already fixed a few 32 bit truncation bugs that could cause qemu-img check to allocate too little memory and consequently it would segfault. On 32 bit hosts, there is one more place that needs to be fixed because size_t was involved in the calculation and is a 32 bit type there. Cc: qemu-stable@nongnu.org Reported-by: Michael S. Tsirkin Signed-off-by: Kevin Wolf Tested-by: Michael S. Tsirkin --- block/qcow2-refcount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6e0e5bd..820f412 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1244,7 +1244,7 @@ fail: /* refcount checking functions */ -static size_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) +static uint64_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) { /* This assertion holds because there is no way we can address more than * 2^(64 - 9) clusters at once (with cluster size 512 = 2^9, and because -- 1.8.3.1