From patchwork Mon Nov 24 15:56:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 414019 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 847101400EA for ; Tue, 25 Nov 2014 03:00:12 +1100 (AEDT) Received: from localhost ([::1]:53286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsw3e-000581-Ap for incoming@patchwork.ozlabs.org; Mon, 24 Nov 2014 11:00:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsw11-0000Ww-6b for qemu-devel@nongnu.org; Mon, 24 Nov 2014 10:57:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsw0v-00043F-1x for qemu-devel@nongnu.org; Mon, 24 Nov 2014 10:57:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsw0u-000436-Q7 for qemu-devel@nongnu.org; Mon, 24 Nov 2014 10:57:20 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAOFvG9L006680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 24 Nov 2014 10:57:16 -0500 Received: from localhost (dhcp-192-247.str.redhat.com [10.33.192.247]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAOFvF47002451 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Mon, 24 Nov 2014 10:57:16 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 24 Nov 2014 16:56:55 +0100 Message-Id: <1416844620-17717-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1416844620-17717-1-git-send-email-mreitz@redhat.com> References: <1416844620-17717-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v2 07/12] qcow2/overlaps: Protect active L1 table 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 Keep track of the active L1 table in the metadata list to protect it against accidental modifications. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2-cluster.c | 11 +++++++++++ block/qcow2-snapshot.c | 10 ++++++++++ block/qcow2.c | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index df0b2c9..131e5b2 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -125,6 +125,17 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, s->l1_table = new_l1_table; old_l1_size = s->l1_size; s->l1_size = new_l1_size; + + qcow2_metadata_list_remove(bs, old_l1_table_offset, + size_to_clusters(s, old_l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + qcow2_free_clusters(bs, old_l1_table_offset, old_l1_size * sizeof(uint64_t), QCOW2_DISCARD_OTHER); return 0; diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 5b3903c..41ea053 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -720,6 +720,11 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, return ret; } + qcow2_metadata_list_remove(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + /* Switch the L1 table */ qemu_vfree(s->l1_table); @@ -731,5 +736,10 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, be64_to_cpus(&s->l1_table[i]); } + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + return 0; } diff --git a/block/qcow2.c b/block/qcow2.c index 1644421..775cb39 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -831,6 +831,10 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, } s->l1_table_offset = header.l1_table_offset; + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); if (s->l1_size > 0) { s->l1_table = qemu_try_blockalign(bs->file,