From patchwork Thu Oct 11 15:16:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 982543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WF2D4DNMz9sC2 for ; Fri, 12 Oct 2018 02:17:24 +1100 (AEDT) Received: from localhost ([::1]:35054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAciI-0006bl-3o for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 11:17:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAchX-0006al-Vf for qemu-devel@nongnu.org; Thu, 11 Oct 2018 11:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAchU-0006hf-VG for qemu-devel@nongnu.org; Thu, 11 Oct 2018 11:16:35 -0400 Received: from relay.sw.ru ([185.231.240.75]:35542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAchU-0006fm-Jp; Thu, 11 Oct 2018 11:16:32 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gAchR-0002Z5-PQ; Thu, 11 Oct 2018 18:16:30 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 11 Oct 2018 18:16:22 +0300 Message-Id: <20181011151623.25702-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181011151623.25702-1-vsementsov@virtuozzo.com> References: <20181011151623.25702-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v3 7/8] block/qcow2-refcount: fix out-of-file L1 entries to be zero 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: kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Zero out corrupted L1 table entry, which reference L2 table out of underlying file. Zero L1 table entry means that "the L2 table and all clusters described by this L2 table are unallocated." Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-refcount.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 65e0fd2de3..5ebe292fc1 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1803,6 +1803,13 @@ static int check_refcounts_l1(BlockDriverState *bs, BDRVQcow2State *s = bs->opaque; uint64_t *l1_table = NULL, l2_offset, l1_size2; int i, ret; + bool fix_er = fix & BDRV_FIX_ERRORS; + RepTableType type = active ? REP_ACTIVE_L1 : REP_INACTIVE_L1; + int64_t file_len = bdrv_getlength(bs->file->bs); + + if (file_len < 0) { + return file_len; + } l1_size2 = l1_size * sizeof(uint64_t); @@ -1837,6 +1844,25 @@ static int check_refcounts_l1(BlockDriverState *bs, if (l2_offset) { /* Mark L2 table as used */ l2_offset &= L1E_OFFSET_MASK; + if (l2_offset >= file_len) { + fprintf(stderr, + "%s: l2 table offset out of file: offset 0x%" PRIx64 + "\n", fix_er ? "Repairing" : "ERROR", l2_offset); + if (fix_er) { + ret = repair_table_entry(bs, res, type, + l1_table_offset, i, 0); + if (ret < 0) { + /* Something is seriously wrong, so abort checking + * this L1 table */ + goto fail; + } + } else { + res->corruptions++; + } + + continue; + } + ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, refcount_table_size, l2_offset, s->cluster_size);