From patchwork Wed May 12 18:25:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 52403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B34ABB7DBF for ; Thu, 13 May 2010 04:28:25 +1000 (EST) Received: from localhost ([127.0.0.1]:47479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCGfN-0001Q5-Tr for incoming@patchwork.ozlabs.org; Wed, 12 May 2010 14:28:22 -0400 Received: from [140.186.70.92] (port=45996 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCGdF-0000Zl-3v for qemu-devel@nongnu.org; Wed, 12 May 2010 14:26:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCGdC-000563-Jd for qemu-devel@nongnu.org; Wed, 12 May 2010 14:26:09 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:65168) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCGdC-00054I-89 for qemu-devel@nongnu.org; Wed, 12 May 2010 14:26:06 -0400 Received: from flocke.weilnetz.de (p54ADF1DC.dip.t-dialin.net [84.173.241.220]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MbLRw-1NvhiJ0zx6-00JVvD; Wed, 12 May 2010 20:25:47 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1OCGcs-0002Iw-CA; Wed, 12 May 2010 20:25:46 +0200 From: Stefan Weil To: qemu-devel@nongnu.org Date: Wed, 12 May 2010 20:25:45 +0200 Message-Id: <1273688745-8828-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4BE90CB6.50709@redhat.com> References: <4BE90CB6.50709@redhat.com> MIME-Version: 1.0 X-Provags-ID: V01U2FsdGVkX18+ciKCdUdOJXl3PX6rhqrJG0N5CGF4IYrenbV O8nXW67zOizrebaGsmq4vnLye/iLARLGzhvofvSm/z+yVbqCsg SuRGHOn9BbwLXzy1eWh0Z2mD5A/VGn25F0OekpWyGN6ynVZXm8 HAw== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf , =?UTF-8?q?Fran=C3=A7ois=20Revol?= Subject: [Qemu-devel] [PATCH] block/vdi: Fix image opening and creation for odd disk sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The fix is based on a patch from Kevin Wolf. Here his comment: "The number of blocks needs to be rounded up to cover all of the virtual hard disk. Without this fix, we can't even open our own images if their size is not a multiple of the block size." While Kevin's patch addressed vdi_create, my modification also fixes vdi_open which now accepts images with odd disk sizes. v3: Don't allow reading of disk images with too large disk sizes. Neither VBoxManage nor old versions of qemu-img read such images. This change requires rounding of odd disk sizes before we do the checks. Cc: Kevin Wolf Cc: François Revol Signed-off-by: Stefan Weil --- block/vdi.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 1ce18d5..b53a3c1 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -393,6 +393,15 @@ static int vdi_open(BlockDriverState *bs, int flags) vdi_header_print(&header); #endif + if (header.disk_size % SECTOR_SIZE != 0) { + /* 'VBoxManage convertfromraw' can create images with odd disk sizes. + We accept them but round the disk size to the next multiple of + SECTOR_SIZE. */ + logout("odd disk size %" PRIu64 " B, round up\n", header.disk_size); + header.disk_size += SECTOR_SIZE - 1; + header.disk_size &= ~(SECTOR_SIZE - 1); + } + if (header.version != VDI_VERSION_1_1) { logout("unsupported version %u.%u\n", header.version >> 16, header.version & 0xffff); @@ -405,18 +414,15 @@ static int vdi_open(BlockDriverState *bs, int flags) /* We only support data blocks which start on a sector boundary. */ logout("unsupported data offset 0x%x B\n", header.offset_data); goto fail; - } else if (header.disk_size % SECTOR_SIZE != 0) { - logout("unsupported disk size %" PRIu64 " B\n", header.disk_size); - goto fail; } else if (header.sector_size != SECTOR_SIZE) { logout("unsupported sector size %u B\n", header.sector_size); goto fail; } else if (header.block_size != 1 * MiB) { logout("unsupported block size %u B\n", header.block_size); goto fail; - } else if ((header.disk_size + header.block_size - 1) / header.block_size != - (uint64_t)header.blocks_in_image) { - logout("unexpected block number %u B\n", header.blocks_in_image); + } else if (header.disk_size > + (uint64_t)header.blocks_in_image * header.block_size) { + logout("unsupported disk size %" PRIu64 " B\n", header.disk_size); goto fail; } else if (!uuid_is_null(header.uuid_link)) { logout("link uuid != 0, unsupported\n"); @@ -829,7 +835,10 @@ static int vdi_create(const char *filename, QEMUOptionParameter *options) return -errno; } - blocks = bytes / block_size; + /* We need enough blocks to store the given disk size, + so always round up. */ + blocks = (bytes + block_size - 1) / block_size; + bmap_size = blocks * sizeof(uint32_t); bmap_size = ((bmap_size + SECTOR_SIZE - 1) & ~(SECTOR_SIZE -1));