From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2NH-0002DJ-Tz for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV2NB-0003M5-Qi for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2NB-0003Lx-Fv for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:17 -0400 From: Stefan Hajnoczi Date: Tue, 1 Apr 2014 19:19:12 +0200 Message-Id: <1396372769-11688-35-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 34/51] qcow2: Fix new L1 table size check (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 The size in bytes is assigned to an int later, so check that instead of the number of entries. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block/qcow2-cluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 9499df9..242e1f8 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -55,7 +55,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, } } - if (new_l1_size > INT_MAX) { + if (new_l1_size > INT_MAX / sizeof(uint64_t)) { return -EFBIG; } -- 1.9.0