From nobody Mon Apr 29 01:12:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502075488638982.3914195394943; Sun, 6 Aug 2017 20:11:28 -0700 (PDT) Received: from localhost ([::1]:35151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deYRz-0005cC-3W for importer@patchew.org; Sun, 06 Aug 2017 23:11:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deYP9-0003hK-Ok for qemu-devel@nongnu.org; Sun, 06 Aug 2017 23:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1deYP8-0005qF-Em for qemu-devel@nongnu.org; Sun, 06 Aug 2017 23:08:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1deYP3-0005ny-UR; Sun, 06 Aug 2017 23:08:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1628778EA2; Mon, 7 Aug 2017 03:08:23 +0000 (UTC) Received: from localhost (ovpn-116-54.phx2.redhat.com [10.3.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C551A77EFD; Mon, 7 Aug 2017 03:08:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1628778EA2 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jcody@redhat.com From: Jeff Cody To: qemu-devel@nongnu.org Date: Sun, 6 Aug 2017 23:08:19 -0400 Message-Id: <85fe374c783a6d659bc86aa7f15d5f442b9d7a45.1502075213.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 07 Aug 2017 03:08:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] block/vhdx: check error return of bdrv_getlength() 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: , Cc: armbru@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Calls to bdrv_getlength() were not checking for error. In vhdx.c, this can lead to truncating an image file, so it is a definite bug. In vhdx-log.c, the path for improper behavior is less clear, but it is best to check in any case. Reported-by: Markus Armbruster Signed-off-by: Jeff Cody Reviewed-by: Eric Blake --- block/vhdx-log.c | 20 ++++++++++++++++---- block/vhdx.c | 9 ++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/block/vhdx-log.c b/block/vhdx-log.c index 01278f3..fd4e7af 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -491,6 +491,7 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHD= XState *s, uint32_t cnt, sectors_read; uint64_t new_file_size; void *data =3D NULL; + int64_t file_length; VHDXLogDescEntries *desc_entries =3D NULL; VHDXLogEntryHeader hdr_tmp =3D { 0 }; =20 @@ -510,10 +511,15 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVV= HDXState *s, if (ret < 0) { goto exit; } + file_length =3D bdrv_getlength(bs->file->bs); + if (file_length < 0) { + ret =3D file_length; + goto exit; + } /* if the log shows a FlushedFileOffset larger than our current fi= le * size, then that means the file has been truncated / corrupted, = and * we must refused to open it / use it */ - if (hdr_tmp.flushed_file_offset > bdrv_getlength(bs->file->bs)) { + if (hdr_tmp.flushed_file_offset > file_length) { ret =3D -EINVAL; goto exit; } @@ -543,7 +549,7 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHD= XState *s, goto exit; } } - if (bdrv_getlength(bs->file->bs) < desc_entries->hdr.last_file_off= set) { + if (file_length < desc_entries->hdr.last_file_offset) { new_file_size =3D desc_entries->hdr.last_file_offset; if (new_file_size % (1024*1024)) { /* round up to nearest 1MB boundary */ @@ -851,6 +857,7 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHD= XState *s, uint32_t partial_sectors =3D 0; uint32_t bytes_written =3D 0; uint64_t file_offset; + int64_t file_length; VHDXHeader *header; VHDXLogEntryHeader new_hdr; VHDXLogDescriptor *new_desc =3D NULL; @@ -913,10 +920,15 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVV= HDXState *s, .sequence_number =3D s->log.sequence, .descriptor_count =3D sectors, .reserved =3D 0, - .flushed_file_offset =3D bdrv_getlength(bs->file->bs), - .last_file_offset =3D bdrv_getlength(bs->file->bs), }; =20 + file_length =3D bdrv_getlength(bs->file->bs); + if (file_length < 0) { + ret =3D file_length; + goto exit; + } + new_hdr.flushed_file_offset =3D file_length; + new_hdr.last_file_offset =3D file_length; new_hdr.log_guid =3D header->log_guid; =20 desc_sectors =3D vhdx_compute_desc_sectors(new_hdr.descriptor_count); diff --git a/block/vhdx.c b/block/vhdx.c index a9cecd2..6a14999 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1166,7 +1166,14 @@ exit: static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s, uint64_t *new_offset) { - *new_offset =3D bdrv_getlength(bs->file->bs); + int64_t current_len; + current_len =3D bdrv_getlength(bs->file->bs); + + if (current_len < 0) { + return current_len; + } + + *new_offset =3D current_len; =20 /* per the spec, the address for a block is in units of 1MB */ *new_offset =3D ROUND_UP(*new_offset, 1024 * 1024); --=20 2.9.4 From nobody Mon Apr 29 01:12:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502075403701474.00480928952015; Sun, 6 Aug 2017 20:10:03 -0700 (PDT) Received: from localhost ([::1]:35141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deYQY-0004Tf-Qz for importer@patchew.org; Sun, 06 Aug 2017 23:09:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deYP9-0003h3-4o for qemu-devel@nongnu.org; Sun, 06 Aug 2017 23:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1deYP8-0005q2-0Y for qemu-devel@nongnu.org; Sun, 06 Aug 2017 23:08:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1deYP4-0005oB-GA; Sun, 06 Aug 2017 23:08:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1595278EB7; Mon, 7 Aug 2017 03:08:24 +0000 (UTC) Received: from localhost (ovpn-116-54.phx2.redhat.com [10.3.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDB8581E1A; Mon, 7 Aug 2017 03:08:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1595278EB7 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jcody@redhat.com From: Jeff Cody To: qemu-devel@nongnu.org Date: Sun, 6 Aug 2017 23:08:20 -0400 Message-Id: <403586fbd705655c9e861b9e57648b598b651896.1502075213.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 07 Aug 2017 03:08:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] block/vhdx: check for offset overflow to bdrv_truncate() 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: , Cc: armbru@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" VHDX uses uint64_t types for most offsets, following the VHDX spec. However, bdrv_truncate() takes an int64_t value for the truncating offset. Check for overflow before calling bdrv_truncate(). N.B.: For a compliant image this is not an issue, as the maximum VHDX image size is defined per the spec to be 64TB. Signed-off-by: Jeff Cody Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- block/vhdx-log.c | 4 ++++ block/vhdx.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/block/vhdx-log.c b/block/vhdx-log.c index fd4e7af..3b74e5d 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -554,6 +554,10 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVH= DXState *s, if (new_file_size % (1024*1024)) { /* round up to nearest 1MB boundary */ new_file_size =3D ((new_file_size >> 20) + 1) << 20; + if (new_file_size > INT64_MAX) { + ret =3D -EINVAL; + goto exit; + } bdrv_truncate(bs->file, new_file_size, PREALLOC_MODE_OFF, = NULL); } } diff --git a/block/vhdx.c b/block/vhdx.c index 6a14999..c45af73 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1177,6 +1177,9 @@ static int vhdx_allocate_block(BlockDriverState *bs, = BDRVVHDXState *s, =20 /* per the spec, the address for a block is in units of 1MB */ *new_offset =3D ROUND_UP(*new_offset, 1024 * 1024); + if (*new_offset > INT64_MAX) { + return -EINVAL; + } =20 return bdrv_truncate(bs->file, *new_offset + s->block_size, PREALLOC_MODE_OFF, NULL); --=20 2.9.4