From patchwork Thu Mar 22 06:24:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev\" via" X-Patchwork-Id: 10300901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADD5A600CC for ; Thu, 22 Mar 2018 06:25:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A12862997E for ; Thu, 22 Mar 2018 06:25:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95A8F2999B; Thu, 22 Mar 2018 06:25:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DDDED2997E for ; Thu, 22 Mar 2018 06:25:57 +0000 (UTC) Received: from localhost ([::1]:59034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eytfg-0004kD-77 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 22 Mar 2018 02:25:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eytey-0004HY-4P for qemu-devel@nongnu.org; Thu, 22 Mar 2018 02:25:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eytev-0003eq-1C for qemu-devel@nongnu.org; Thu, 22 Mar 2018 02:25:12 -0400 Received: from synology.com ([59.124.61.242]:38488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyteu-0003dQ-G0 for qemu-devel@nongnu.org; Thu, 22 Mar 2018 02:25:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1521699904; bh=CdFZnfbtxWhEQQCg7Bkjj9fcC4MNosNCVz3G4ZSnUIQ=; h=From:To:Cc:Subject:Date; b=sfK9lV0MUBhnN24oIENgwkqw12ZksuCntxa9QaJ0df4DPb/YXZnMSckIJeAhQi7t1 6CsBLfoKsLk2d9vXmK9FF3u+pgFRU0+MaQwnCWU4u1ehKgabemdtNuirknrlX6L9HT HHjq7eyBkTMACHrkW5g97+/Kl3xD7IzBb6FCT/rE= To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 14:24:47 +0800 Message-Id: <20180322062447.16537-1-yuchenlin@synology.com> X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 5, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 59.124.61.242 Subject: [Qemu-devel] [PATCH v2] vmdk: return ERROR when cluster sector is larger than vmdk limitation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: yuchenlin--- via Qemu-devel From: "Denis V. Lunev\" via" Reply-To: yuchenlin@synology.com Cc: yuchenlin , famz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: yuchenlin VMDK has a hard limitation of extent size, which is due to the size of grain table entry is 32 bits. It means it can only point to a grain located at offset = 2^32. To avoid writing the user data beyond limitation and record a useless offset in grain table. We should return ERROR here. Signed-off-by: yuchenlin Reviewed-by: Fam Zheng --- v1->v2: - change commit message - check before allocating - should be >= - the unit is sector now thanks block/vmdk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index f94c49a9c0..a1c21dbbba 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -47,6 +47,8 @@ #define VMDK4_FLAG_MARKER (1 << 17) #define VMDK4_GD_AT_END 0xffffffffffffffffULL +#define VMDK_EXTENT_MAX_SECTORS (4294967296) + #define VMDK_GTE_ZEROED 0x1 /* VMDK internal error codes */ @@ -1250,6 +1252,10 @@ static int get_cluster_offset(BlockDriverState *bs, return zeroed ? VMDK_ZEROED : VMDK_UNALLOC; } + if (extent->next_cluster_sector >= VMDK_EXTENT_MAX_SECTORS) { + return VMDK_ERROR; + } + cluster_sector = extent->next_cluster_sector; extent->next_cluster_sector += extent->cluster_sectors;