From nobody Tue May 21 22:38:14 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=1607444968; cv=none; d=zohomail.com; s=zohoarc; b=GXyp9Czlb1Jyc7nIazl+QJSEG0QxxPqzojqC/9uUF5hfVTNAtSIsjkBVrYGKJRMDV0G1sNfzwT4fUCm5HDURuayF/K9hWY3MvI8gjuK0186L5zSYAbbhSq6AFsxAztSBL/5k8T+T3mznDLqSAGH+8sGhDqIQSTZnO5t1sxHhrro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607444968; 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=KIoEZDm48Fo8SEoto+2ZjE1y9IVnmTPDLUXGszO1bj4=; b=aeI6mjcprNJCyJWdfhIQHMiw65N8lMrhRdtFpr8Qx7KE4FwKB0iCVDX5lwDkwRQNOztb6cdnLV7GIA7uflwHlXIC/9trzrOkZtFv6fdus5Br2SGwfM2z1JC4YmQCz0BOGU5mzuNIDSoill12mP39gmHq6il2FUco+7n1WLDtZJo= 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 1607444968594615.2443449979127; Tue, 8 Dec 2020 08:29:28 -0800 (PST) Received: from localhost ([::1]:36630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmdup-0004YS-R0 for importer@patchew.org; Tue, 08 Dec 2020 09:24:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmdsd-0002Ss-9P for qemu-devel@nongnu.org; Tue, 08 Dec 2020 09:22:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmdsZ-0005CV-Lw for qemu-devel@nongnu.org; Tue, 08 Dec 2020 09:22:15 -0500 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-266-6VuLEkRfPm67hMgdrxtITA-1; Tue, 08 Dec 2020 09:22:08 -0500 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 554499CC0D; Tue, 8 Dec 2020 14:22:07 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2577D50C0D; Tue, 8 Dec 2020 14:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607437330; 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=KIoEZDm48Fo8SEoto+2ZjE1y9IVnmTPDLUXGszO1bj4=; b=D9da5Ebf7apr159LpLKTavp09bRfFsoJ+0wqB65uFRNIYVe20tmXvRf88UUxMpt/UD/sJJ AVgzT0ziRXe7RDJpS94ZLIcylHdHIVHQ39BJbrHLiK8As/CeW4gzKctGwBpT2cet3E/85Z K371FP/gr/QComY00LUyk64QdARDUzY= X-MC-Unique: 6VuLEkRfPm67hMgdrxtITA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 1/2] crypto: luks: Fix tiny memory leak Date: Tue, 8 Dec 2020 16:21:58 +0200 Message-Id: <20201208142159.492489-2-mlevitsk@redhat.com> In-Reply-To: <20201208142159.492489-1-mlevitsk@redhat.com> References: <20201208142159.492489-1-mlevitsk@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=mlevitsk@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=63.128.21.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Kevin Wolf , Maxim Levitsky , Alberto Garcia , qemu-block@nongnu.org, Max Reitz 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" When the underlying block device doesn't support the bdrv_co_delete_file interface, an 'Error' object was leaked. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia --- block/crypto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/crypto.c b/block/crypto.c index aef5a5721a..b3a5275132 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -735,6 +735,8 @@ fail: */ if ((r_del < 0) && (r_del !=3D -ENOTSUP)) { error_report_err(local_delete_err); + } else { + error_free(local_delete_err); } } =20 --=20 2.26.2 From nobody Tue May 21 22:38:14 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=1607442753; cv=none; d=zohomail.com; s=zohoarc; b=hH7GKpZEjav88epI+hxMWsf3LVcJvkFX1760t+E5j72/2+a3xGCTmbXizc0VnGUNPPcQ4GHI/TjrCpuaWhX48XK1CSgdHj8I79H+LJTCQOb0bXX/H/lpmSJS455/o+LQFSgGpEHiAxeierEqluuCFemmFiAk7UGgErXfn97+TJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607442753; 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=TUvYH7Ab9K730Vam2H02MvE9Tv11hlA9Pwl56H34s7Y=; b=icqb6GY0pAWgm4II5llnyJCReq3j+Vz2utvKBVyFyeDxjhUdAXJmU9L5cHqI/vdObh4kPj61NtY/VtpssXzxyMN5aDUokJoqtsWRaMEbZkhz3FZUL1cA7Fvap2R5qNPc9IjkU09XvKkdzw7O/l5Q/Q1aBVCQywaIdhsy55AWTHQ= 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 1607442753853461.28971934723313; Tue, 8 Dec 2020 07:52:33 -0800 (PST) Received: from localhost ([::1]:42254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmdwt-0006yf-DR for importer@patchew.org; Tue, 08 Dec 2020 09:26:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmdsg-0002Vs-BL for qemu-devel@nongnu.org; Tue, 08 Dec 2020 09:22:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmdsc-0005Dy-Am for qemu-devel@nongnu.org; Tue, 08 Dec 2020 09:22:17 -0500 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-447-wr9Bm5iCNPyAax3ZdBUf-g-1; Tue, 08 Dec 2020 09:22:11 -0500 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 F3625107ACF5; Tue, 8 Dec 2020 14:22:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB68E63B8C; Tue, 8 Dec 2020 14:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607437332; 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=TUvYH7Ab9K730Vam2H02MvE9Tv11hlA9Pwl56H34s7Y=; b=eZWMwQQw2QQlOQ0fvlipDKEf2aDQlmdIp91m9IK7t7DFcbNZp4xNKJRwv/aehkeGxO4V/Z 0Vu6cr4Izi7qXHU+vkVMh/w8w9/PVYFBz7DpB36fL/Uvn2UqtPCKqwluPUC4x/jmWCey7z HUWg/IeCl7ac5ArB1EStATWcNF/l1RY= X-MC-Unique: wr9Bm5iCNPyAax3ZdBUf-g-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 2/2] block: qcow2: remove the created file on initialization error Date: Tue, 8 Dec 2020 16:21:59 +0200 Message-Id: <20201208142159.492489-3-mlevitsk@redhat.com> In-Reply-To: <20201208142159.492489-1-mlevitsk@redhat.com> References: <20201208142159.492489-1-mlevitsk@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=mlevitsk@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=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Kevin Wolf , Maxim Levitsky , Alberto Garcia , qemu-block@nongnu.org, Max Reitz 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" If the qcow initialization fails, we should remove the file if it was already created, to avoid leaving stale files around. We already do this for luks raw images. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia --- block/qcow2.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 3a90ef2786..3bc2096b72 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3848,6 +3848,19 @@ static int coroutine_fn qcow2_co_create_opts(BlockDr= iver *drv, /* Create the qcow2 image (format layer) */ ret =3D qcow2_co_create(create_options, errp); if (ret < 0) { + + Error *local_delete_err =3D NULL; + int r_del =3D bdrv_co_delete_file(bs, &local_delete_err); + /* + * ENOTSUP will happen if the block driver doesn't support + * the 'bdrv_co_delete_file' interface. This is a predictable + * scenario and shouldn't be reported back to the user. + */ + if ((r_del < 0) && (r_del !=3D -ENOTSUP)) { + error_report_err(local_delete_err); + } else { + error_free(local_delete_err); + } goto finish; } =20 --=20 2.26.2