From nobody Thu Apr 25 07:07:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620040237; cv=none; d=zohomail.com; s=zohoarc; b=EAUYlKWw9lilfDrEA24rQFgOHeuFemi9yAzxSsT3ObMgdsufRLZPKB6Fn17DATeELSl4RTU2PiQl3+frRASPtJpBPEtTQdcAtkMkFYDqWqTEH7+UcmM0ro7XC6AOiC2aEQzbzdy1mZmK0MxKaK7aHKVSXU9bZNNe9BXDWjJvs14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620040237; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZDT/sHVjTjVfLRYltLIksWDIHJSYhgnPGkI9yVzlnpo=; b=ROGUAEAMwYjmtC/Up6ceVDjdd+UctuRIHki3NfWl79RQ5C+YI2BtjG/A8kpVuvyYOyWtAVBNjPA+scWwMmFcLjxRg5xznv9uyTt7iOjfrEdLhDJyVIH2jRWQPWIiSxum4g++2mNMFrOPtXq0ZbYBxx9F9yW69zD8pGCCtSg+54c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620040237911695.7833212336701; Mon, 3 May 2021 04:10:37 -0700 (PDT) Received: from localhost ([::1]:55518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWTE-0002cm-UN for importer@patchew.org; Mon, 03 May 2021 07:10:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWOs-00075K-TK for qemu-devel@nongnu.org; Mon, 03 May 2021 07:06:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWOr-0007ib-8t for qemu-devel@nongnu.org; Mon, 03 May 2021 07:06:06 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-_dZhzZGZPNq9P5NJJ_-gog-1; Mon, 03 May 2021 07:06:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 296288018A7; Mon, 3 May 2021 11:06:02 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-251.ams2.redhat.com [10.36.113.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A9B66062F; Mon, 3 May 2021 11:06:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620039964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZDT/sHVjTjVfLRYltLIksWDIHJSYhgnPGkI9yVzlnpo=; b=DvmAhLDC0UbAC9Nr6BB7mLp8cXNqdn2v6IB4ZlZED5S05bj+c/CWCGAxQcWqrCc5EhyPYq fJ6ktOVJpJxGeFfm2SRqwXq/bV1Qcm2EEbASmm2/FCY4B9yuVyTJE9HciK+pkd5uvAjBiC nQUN6C/nYOAs649bvChJDzjZUixxKbo= X-MC-Unique: _dZhzZGZPNq9P5NJJ_-gog-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 1/2] block: Fix Transaction leak in bdrv_root_attach_child() Date: Mon, 3 May 2021 13:05:54 +0200 Message-Id: <20210503110555.24001-2-kwolf@redhat.com> In-Reply-To: <20210503110555.24001-1-kwolf@redhat.com> References: <20210503110555.24001-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The error path needs to call tran_finalize(), too. Fixes: CID 1452773 Fixes: 548a74c0dbc858edd1a7ee3045b5f2fe710bd8b1 Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 874c22c43e..5c0ced6238 100644 --- a/block.c +++ b/block.c @@ -2918,13 +2918,14 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState = *child_bs, child_role, perm, shared_perm, opaque, &child, tran, errp); if (ret < 0) { - bdrv_unref(child_bs); - return NULL; + assert(child =3D=3D NULL); + goto out; } =20 ret =3D bdrv_refresh_perms(child_bs, errp); - tran_finalize(tran, ret); =20 +out: + tran_finalize(tran, ret); bdrv_unref(child_bs); return child; } --=20 2.30.2 From nobody Thu Apr 25 07:07:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620040152; cv=none; d=zohomail.com; s=zohoarc; b=k6bbrStJ/zY96QAj1VA0Vz5gvt5TWR1fzM+jSFUi/eKq0azpcCAPWKt7nNOQfZnBTZYzeuxJq5rqjiA1tgdfd6MUWYcFaZRBsTlaHE78HqEtqG1TZRHAIrJRy0WSntc9sEv0lCppgFSZ86FzRqYNsvJejs0aaM+weDaOjpJYhOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620040152; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e/4CRlX9f9eB9WO5rgzFk8hyKbjHW3xq6h+vpHho8Xk=; b=kMH/9fJnGS+Y5CcHv6MDV0YDPE9tSlNiJTVgr6p6VBDPHMBl/y/Alxbzf/AhKbBAxAq9dE4Wohu5KiqQCfHwgM5fqXB6y045aUAKrGPKnO48zShRIm5RKU3Xr3Tm4A6sHpv4tuDNlsRrpHV/J7UaOUXe5lCrmILMfo6YkjxQm84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620040152751909.4640582520111; Mon, 3 May 2021 04:09:12 -0700 (PDT) Received: from localhost ([::1]:51174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWRr-0000nO-PE for importer@patchew.org; Mon, 03 May 2021 07:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWOv-00079y-HE for qemu-devel@nongnu.org; Mon, 03 May 2021 07:06:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWOt-0007jb-CG for qemu-devel@nongnu.org; Mon, 03 May 2021 07:06:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-atFgK8T8MXqPAwDf8dEwsw-1; Mon, 03 May 2021 07:06:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BB55800D62; Mon, 3 May 2021 11:06:03 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-251.ams2.redhat.com [10.36.113.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70EE56062F; Mon, 3 May 2021 11:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620039966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e/4CRlX9f9eB9WO5rgzFk8hyKbjHW3xq6h+vpHho8Xk=; b=TRb2dJsZSSc4dz3WVsNBOa5TaNMX/erOeGB6doKleP6Gk9IVYFSHuBTJAiLspyjVnreIxT ciALzyjkQr/V9qXSub14MgOXAAHJHVKpoNOWHAiSWIt0zbvZk8clmnV3M5g7a2Jy2UMwZP OlUoRM/gqEwiBM6qKBis6eaZWlhor24= X-MC-Unique: atFgK8T8MXqPAwDf8dEwsw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 2/2] block: Fix Transaction leak in bdrv_reopen_multiple() Date: Mon, 3 May 2021 13:05:55 +0200 Message-Id: <20210503110555.24001-3-kwolf@redhat.com> In-Reply-To: <20210503110555.24001-1-kwolf@redhat.com> References: <20210503110555.24001-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Like other error paths, this one needs to call tran_finalize() and clean up the BlockReopenQueue, too. Fixes: CID 1452772 Fixes: 72373e40fbc7e4218061a8211384db362d3e7348 Signed-off-by: Kevin Wolf Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 5c0ced6238..69615fabd1 100644 --- a/block.c +++ b/block.c @@ -4052,7 +4052,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) ret =3D bdrv_flush(bs_entry->state.bs); if (ret < 0) { error_setg_errno(errp, -ret, "Error flushing drive"); - goto cleanup; + goto abort; } } =20 --=20 2.30.2