From patchwork Tue Oct 22 06:43:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 285368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D650E2C00CE for ; Tue, 22 Oct 2013 17:44:49 +1100 (EST) Received: from localhost ([::1]:43247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYVhv-00043e-Ak for incoming@patchwork.ozlabs.org; Tue, 22 Oct 2013 02:44:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYVhZ-00042c-V9 for qemu-devel@nongnu.org; Tue, 22 Oct 2013 02:44:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VYVhU-0006S4-EL for qemu-devel@nongnu.org; Tue, 22 Oct 2013 02:44:25 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:44597 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYVhU-0006Rj-1N for qemu-devel@nongnu.org; Tue, 22 Oct 2013 02:44:20 -0400 Received: (qmail 1803 invoked by uid 89); 22 Oct 2013 06:44:17 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/17990. hbedv: 8.2.12.132/7.11.108.232. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/4.0):. Processed in 1.696257 secs); 22 Oct 2013 06:44:17 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 22 Oct 2013 06:44:15 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 6A0A620688; Tue, 22 Oct 2013 08:43:25 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 383AA610F6; Tue, 22 Oct 2013 08:43:27 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 22 Oct 2013 08:43:25 +0200 Message-Id: <1382424205-19742-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, aliguori@us.ibm.com, jcody@redhat.com, Peter Lieven , stefanha@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] block/vpc: check that the image has not been truncated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org this adds a check that a dynamic VHD file has not been accidently truncated (e.g. during transfer or upload). Signed-off-by: Peter Lieven --- block/vpc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/vpc.c b/block/vpc.c index 1acc1d4..921364e 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -269,6 +269,13 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, } } + if (s->free_data_block_offset > bdrv_getlength(bs->file)) { + ret = -EINVAL; + fprintf(stderr, "block-vpc: free_data_block_offset points after" + "the end of file. the image has been truncated.\n"); + goto fail; + } + s->last_bitmap_offset = (int64_t) -1; #ifdef CACHE