From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47F47C04AA7 for ; Mon, 13 May 2019 15:08:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CAE9208C3 for ; Mon, 13 May 2019 15:08:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CAE9208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:58914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQCZ9-00079P-90 for qemu-devel@archiver.kernel.org; Mon, 13 May 2019 11:08:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQCXg-0006N2-C7 for qemu-devel@nongnu.org; Mon, 13 May 2019 11:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQCXc-0003Ll-D8 for qemu-devel@nongnu.org; Mon, 13 May 2019 11:07:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60234) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQCXO-00036z-TG; Mon, 13 May 2019 11:06:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B53F2C0495A1; Mon, 13 May 2019 15:06:42 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-188.bos.redhat.com [10.18.17.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2C4C1001E65; Mon, 13 May 2019 15:06:38 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 13 May 2019 11:06:38 -0400 Message-Id: <20190513150638.14622-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 13 May 2019 15:06:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] blockdev: fix missed target unref for drive-backup 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: Kevin Wolf , aihua liang , John Snow , Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If the bitmap can't be used for whatever reason, we skip putting down the reference. Fix that. In practice, this means that if you attempt to gracefully exit QEMU after a backup command being rejected, bdrv_close_all will fail and tell you some unpleasant things via assert(). Reported-by: aihua liang Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1703916 Signed-off-by: John Snow Reviewed-by: Kevin Wolf --- blockdev.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/blockdev.c b/blockdev.c index 79fbac8450..e856ca4be9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3525,8 +3525,7 @@ static BlockJob *do_drive_backup(DriveBackup *backu= p, JobTxn *txn, if (set_backing_hd) { bdrv_set_backing_hd(target_bs, source, &local_err); if (local_err) { - bdrv_unref(target_bs); - goto out; + goto unref; } } =20 @@ -3534,11 +3533,10 @@ static BlockJob *do_drive_backup(DriveBackup *bac= kup, JobTxn *txn, bmap =3D bdrv_find_dirty_bitmap(bs, backup->bitmap); if (!bmap) { error_setg(errp, "Bitmap '%s' could not be found", backup->b= itmap); - bdrv_unref(target_bs); - goto out; + goto unref; } if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) { - goto out; + goto unref; } } if (!backup->auto_finalize) { @@ -3552,12 +3550,13 @@ static BlockJob *do_drive_backup(DriveBackup *bac= kup, JobTxn *txn, backup->sync, bmap, backup->compress, backup->on_source_error, backup->on_target_e= rror, job_flags, NULL, NULL, txn, &local_err); - bdrv_unref(target_bs); if (local_err !=3D NULL) { error_propagate(errp, local_err); - goto out; + goto unref; } =20 +unref: + bdrv_unref(target_bs); out: aio_context_release(aio_context); return job; --=20 2.20.1