From patchwork Thu Oct 10 08:52:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 282176 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 F2EFC2C00E9 for ; Thu, 10 Oct 2013 19:53:13 +1100 (EST) Received: from localhost ([::1]:45690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUBza-0004cU-JM for incoming@patchwork.ozlabs.org; Thu, 10 Oct 2013 04:53:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUBz9-0004c7-46 for qemu-devel@nongnu.org; Thu, 10 Oct 2013 04:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUBz0-0006sw-Rl for qemu-devel@nongnu.org; Thu, 10 Oct 2013 04:52:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUBz0-0006sf-Jm for qemu-devel@nongnu.org; Thu, 10 Oct 2013 04:52:34 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9A8qXej000820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 10 Oct 2013 04:52:33 -0400 Received: from localhost (dhcp-200-247.str.redhat.com [10.33.200.247]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9A8qW70009671 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 10 Oct 2013 04:52:33 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Thu, 10 Oct 2013 10:52:23 +0200 Message-Id: <1381395144-4449-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1381395144-4449-1-git-send-email-mreitz@redhat.com> References: <1381395144-4449-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH 1/2] qcow2: Undo leaked allocations in co_writev 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 If the write request spans more than one L2 table, qcow2_alloc_cluster_offset cannot handle the required allocations atomically. This results in leaks if it allocated new clusters in any but the last L2 table touched and an error occurs in qcow2_co_writev before having established the L2 link. These non-atomic allocations were, however, indeed successful and are therefore given to the caller in the L2Meta list. If an error occurs in qcow2_co_writev and the L2Meta list is unwound, all its remaining entries are clusters whose L2 links were not yet established. Thus, all allocations in that list should be undone. Signed-off-by: Max Reitz --- block/qcow2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index b2489fb..6bedd5d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1017,6 +1017,13 @@ fail: while (l2meta != NULL) { QCowL2Meta *next; + /* Undo all leaked allocations */ + if (l2meta->nb_clusters != 0) { + qcow2_free_clusters(bs, l2meta->alloc_offset, + l2meta->nb_clusters << s->cluster_bits, + QCOW2_DISCARD_ALWAYS); + } + if (l2meta->nb_clusters != 0) { QLIST_REMOVE(l2meta, next_in_flight); }