From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2N9-0001uI-G6 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV2N3-0003JM-1c for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2N2-0003Ix-Pr for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:08 -0400 From: Stefan Hajnoczi Date: Tue, 1 Apr 2014 19:19:08 +0200 Message-Id: <1396372769-11688-31-git-send-email-stefanha@redhat.com> In-Reply-To: <1396372769-11688-1-git-send-email-stefanha@redhat.com> References: <1396372769-11688-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.0 30/51] qcow2: Avoid integer overflow in get_refcount (CVE-2014-0143) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Stefan Hajnoczi From: Kevin Wolf This ensures that the checks catch all invalid cluster indexes instead of returning the refcount of a wrong cluster. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- 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 220b322..561d659 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -89,7 +89,7 @@ static int load_refcount_block(BlockDriverState *bs, static int get_refcount(BlockDriverState *bs, int64_t cluster_index) { BDRVQcowState *s = bs->opaque; - int refcount_table_index, block_index; + uint64_t refcount_table_index, block_index; int64_t refcount_block_offset; int ret; uint16_t *refcount_block; -- 1.9.0