From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8y8-0001sY-VN for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC8y3-0000kS-Ex for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8y3-0000k8-8A for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:47 -0500 From: Stefan Hajnoczi Date: Fri, 16 Jan 2015 15:37:11 +0000 Message-Id: <1421422633-25536-15-git-send-email-stefanha@redhat.com> In-Reply-To: <1421422633-25536-1-git-send-email-stefanha@redhat.com> References: <1421422633-25536-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 14/16] qed: check for header size overflow List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Header size is denoted in clusters. The maximum cluster size is 64 MB but there is no limit on header size. Check for uint32_t overflow in case the header size field has a whacky value. Signed-off-by: Stefan Hajnoczi Message-id: 1421065893-18875-2-git-send-email-stefanha@redhat.com Reviewed-by: Kevin Wolf --- block/qed.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/qed.c b/block/qed.c index 80f18d8..892b13c 100644 --- a/block/qed.c +++ b/block/qed.c @@ -440,6 +440,11 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags, s->l2_mask = s->table_nelems - 1; s->l1_shift = s->l2_shift + ffs(s->table_nelems) - 1; + /* Header size calculation must not overflow uint32_t */ + if (s->header.header_size > UINT32_MAX / s->header.cluster_size) { + return -EINVAL; + } + if ((s->header.features & QED_F_BACKING_FILE)) { if ((uint64_t)s->header.backing_filename_offset + s->header.backing_filename_size > -- 2.1.0