From nobody Sun May 19 07:31:53 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=1607549078; cv=none; d=zohomail.com; s=zohoarc; b=KfxyvHajf0LWjpQBfdVqDH8CeaelzZom88S8qkhb2pLS32+6JeH1uyrZrZXWd2ODRySfC6DuExOUjMAiqx7j+JU45SbppDHv59sEJv5Jq4zseSRN/+rqnY6nGQbMtYrhobYrsrBhKsEoQHUbuBLxd1Ecmf741xTP4oNJxLdGYZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607549078; 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=LjARZZQ93Yi2jO25c2MoH/1rJ5AGJI/lx7Ttbk0VCHA=; b=jto/uOA1KEVytdf34AJqU3fOjn4pLozlanZg2o4uZ8l0LUDAjDHLtMLXOrKTHmIitqquf9v/yM4nnHAoOdVqdWBNsxmc5tS6D/brMezzBhz0g3+cHgmq05+nbnQf/80drnDNb22/SrYWsrQWvzOZqBSTyB+n5PL1+dFHQvTCOUg= 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 1607549078525641.313479811421; Wed, 9 Dec 2020 13:24:38 -0800 (PST) Received: from localhost ([::1]:41822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn6He-0007fG-Qe for importer@patchew.org; Wed, 09 Dec 2020 15:41:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn69a-0007lT-IW for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn69Z-0005Wp-2J for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:38 -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-106-9qLEZcMEPbCICTC_nyTmwg-1; Wed, 09 Dec 2020 15:33:34 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AC4B10054FF; Wed, 9 Dec 2020 20:33:33 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id E265A19725; Wed, 9 Dec 2020 20:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607546016; 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=LjARZZQ93Yi2jO25c2MoH/1rJ5AGJI/lx7Ttbk0VCHA=; b=LUX+ueJZKIUvCGSDt9OnJhiEKf6VR23CTHSDuc0OlFGsShUZ1cbrqOlerQ3+gAJQ26FOtw mG4+XGG0Af7hCKpyCa0FjSpxyzTiMCZ7JHIfH6+9GEIkHdh5/5tURjlSjgPVLc0zgbySBl UziheMiYNw3N/t6fDFjEKgPkte5kBdo= X-MC-Unique: 9qLEZcMEPbCICTC_nyTmwg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v5 1/4] crypto: luks: Fix tiny memory leak Date: Wed, 9 Dec 2020 22:33:23 +0200 Message-Id: <20201209203326.879381-2-mlevitsk@redhat.com> In-Reply-To: <20201209203326.879381-1-mlevitsk@redhat.com> References: <20201209203326.879381-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=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" 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 Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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 Sun May 19 07:31:53 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=1607547344; cv=none; d=zohomail.com; s=zohoarc; b=CPupSPTYKQFbDb3A8ksdRafsdkjOXugrZ8L/YZ4gBcR2a2rxU3BSXJSvvMnMDTQq+YleD7S5gUU1Ewep6isSawcYpR97lL9dLR0yEv858jWHXs4T7xH5LLJPmgRN8U1qU0Ht5kvNsflJbWmSqxuy14hMJWxh/zepvrM6TBziHCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547344; 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=d1sURo60mY6L8+NjkhrWIC2OJbgd902cGmc8Gimocu8=; b=HdwmPLwuLsUSFo+OVNk9IMJGwdnDE71rUHt6ZD/83uL2Xv5CmlsNYC4OConYp2LdrahvmLuuH5Y1tp3Mps8YAMhfwJfWjEj90BK0P/de5pLdt67iNqppodEVC4ydu4tqskR0na/t1Aamrj6HzbqN155jIvtKHPlD8nFp8QIg0YA= 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 160754734444278.16448963252685; Wed, 9 Dec 2020 12:55:44 -0800 (PST) Received: from localhost ([::1]:49480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn6JU-0002Nx-1b for importer@patchew.org; Wed, 09 Dec 2020 15:43:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn69d-0007mo-SV for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn69b-0005XM-Mw for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:41 -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-85-thonCeD_PvGdHzzMgvDs2g-1; Wed, 09 Dec 2020 15:33:37 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECB598030A8; Wed, 9 Dec 2020 20:33:35 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1DA719725; Wed, 9 Dec 2020 20:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607546019; 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=d1sURo60mY6L8+NjkhrWIC2OJbgd902cGmc8Gimocu8=; b=OOiUSRV2f2h/zY92wm3jVQMqVTPWtTjjOtyMn49711m7sHLTI4S0lxS9tr3jqyibO4M1Ig ULRPejPbWfYV11NeKSap+ePnewjPumVJiLZ9NXrPGG8/4O3C7uCjrffVPhg2PsBNiMdYwI twczkPtBsEgFUDjyFedxAiR32eCfqhk= X-MC-Unique: thonCeD_PvGdHzzMgvDs2g-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v5 2/4] block: add bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 22:33:24 +0200 Message-Id: <20201209203326.879381-3-mlevitsk@redhat.com> In-Reply-To: <20201209203326.879381-1-mlevitsk@redhat.com> References: <20201209203326.879381-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=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" This function wraps bdrv_co_delete_file for the common case of removing a f= ile, which was just created by format driver, on an error condition. It hides the -ENOTSUPP error, and reports all other errors otherwise. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 24 ++++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 25 insertions(+) diff --git a/block.c b/block.c index f1cedac362..5d35ba2fb8 100644 --- a/block.c +++ b/block.c @@ -704,6 +704,30 @@ int coroutine_fn bdrv_co_delete_file(BlockDriverState = *bs, Error **errp) return ret; } =20 +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) +{ + Error *local_err =3D NULL; + int ret; + + if (!bs) { + return; + } + + ret =3D bdrv_co_delete_file(bs, &local_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 (ret =3D=3D -ENOTSUP) { + error_free(local_err); + } else if (ret < 0) { + error_report_err(local_err); + } +} + + + /** * Try to get @bs's logical and physical block size. * On success, store them in @bsz struct and return 0. diff --git a/include/block/block.h b/include/block/block.h index c9d7c58765..af03022723 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -428,6 +428,7 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, Blo= ckDriverState *base, Error **errp); void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *b= ase); int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp); +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs); =20 =20 typedef struct BdrvCheckResult { --=20 2.26.2 From nobody Sun May 19 07:31:53 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=1607547171; cv=none; d=zohomail.com; s=zohoarc; b=X8/j3kvQSeI9ZEkpIXMqj8h+id2XFtS/z6yEeg02M68gsE20L+cb/g7/aytBr2Hgr5VJWvMa3W7aA4IUoxjn6fHFfI0HfQHDMIV4/IyG6vbWFzuQbk3KHEyWBCeGDl8S4yTV/BUVzQVtkx06LF6Ow0/9pE4WP/ggal6Z7lOkRlo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547171; 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=VvG7gJle93Lo206/tkUeE91Psd4UAHN8zzJhVenzKAM=; b=QoFbDLzxlkaPmTNrDGb1klAtpPSHv+eCTaS51Lbmv850xM6b/0daNIL67hBqPpOcO2/NL8ILfs78g1VRbZfHKl3vK777Hs9OgDQckX/U52RO0CS+91IMrHH6QU/dlBsYCXifSabJ3EQNlE7ZdziRN3n3pS1R4+/JGB1lVWA5XPw= 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 16075471719005.655754672952526; Wed, 9 Dec 2020 12:52:51 -0800 (PST) Received: from localhost ([::1]:55128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn6Ll-0004q3-6j for importer@patchew.org; Wed, 09 Dec 2020 15:46:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn69k-0007ox-Lt for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22716) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn69h-0005YT-OX for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:48 -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-587-wPJ2HBQpNFGyVD7k6D8wQQ-1; Wed, 09 Dec 2020 15:33:40 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B0E8107ACE3; Wed, 9 Dec 2020 20:33:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8871919725; Wed, 9 Dec 2020 20:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607546023; 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=VvG7gJle93Lo206/tkUeE91Psd4UAHN8zzJhVenzKAM=; b=F8mj8nmFUXMkxVTm4+qCHswdgGg4wFgxZGBqzX8+qnGDcJisDa/1YrHi2Xc8ufNM+WiZQE kosdafdmehn2T5nksUPFosq/B+t0FPwmiWaVASgvk8nd+bFVN0MBed09azTlR1ccxO8c8E valwcQQOJ9pIAbtZjLTnAQ4jkHLrXes= X-MC-Unique: wPJ2HBQpNFGyVD7k6D8wQQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v5 3/4] crypto: luks: use bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 22:33:25 +0200 Message-Id: <20201209203326.879381-4-mlevitsk@redhat.com> In-Reply-To: <20201209203326.879381-1-mlevitsk@redhat.com> References: <20201209203326.879381-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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" This refactoring is now possible thanks to this function. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/crypto.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index b3a5275132..1d30fde38e 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -725,19 +725,8 @@ fail: * If an error occurred, delete 'filename'. Even if the file existed * beforehand, it has been truncated and corrupted in the process. */ - if (ret && bs) { - 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); - } + if (ret) { + bdrv_co_delete_file_noerr(bs); } =20 bdrv_unref(bs); --=20 2.26.2 From nobody Sun May 19 07:31:53 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=1607547450; cv=none; d=zohomail.com; s=zohoarc; b=OgY8VqnqWj/1aXOFnlp0Nia8j01xEVz6d31Az3ReieMAgVomBIxxi9/U3zAfoob4q/etX3+53Fr1aTTj3ZMJg55bIdRFy8sQCVuH96VY98tekMvq9LdxHL1CNGsc2eaTqOCvTSgHVrugqM+ODKjJTmsIvkq5yRfdMqd6981oL1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547450; 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=8+4qYXQ08FS1twXTXk0HguvPTSJfQOgsdOYbqBU6lg0=; b=dMkGJmZw/6R7BKLcwXsSbtToNufIpuJCJPNzcr1MFwLqnPuzGP8/e4RZH3+vvDU7nnDlXYA8imo/RoRsYdExvnXxEkyczCQ/WOYQmasBkw3Oh+42GcFvVeKiEMtd1W+hWRW0tfJiKgFuqROd35AVaKV2LmSMcm9mUmbO/xzcr+E= 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 1607547450953558.1776633939304; Wed, 9 Dec 2020 12:57:30 -0800 (PST) Received: from localhost ([::1]:56776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn6DM-00024a-9X for importer@patchew.org; Wed, 09 Dec 2020 15:37:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn69l-0007ps-Jg for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn69k-0005Zj-8C for qemu-devel@nongnu.org; Wed, 09 Dec 2020 15:33:49 -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-57-zjMu1cdpNsq7qiI2xgYbtQ-1; Wed, 09 Dec 2020 15:33:43 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE714800D53; Wed, 9 Dec 2020 20:33:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99A9519725; Wed, 9 Dec 2020 20:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607546026; 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=8+4qYXQ08FS1twXTXk0HguvPTSJfQOgsdOYbqBU6lg0=; b=D6K8n7U1pW9Fj+n/q+Cto1R78wWF1O6h2RGzSOEGe2jaG776dQMY8YPrz6ZPoo5sjAnwWb eAcy5n1lmOK2tgXNl2bZELosW9Vt0Vpfggbb0h8S7qkoKj3KJdv0fG6G7VjD4RbKF8rJPP utXi9mGGLdzzN5l+3vCoepmLvvgAlPY= X-MC-Unique: zjMu1cdpNsq7qiI2xgYbtQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v5 4/4] block: qcow2: remove the created file on initialization error Date: Wed, 9 Dec 2020 22:33:26 +0200 Message-Id: <20201209203326.879381-5-mlevitsk@redhat.com> In-Reply-To: <20201209203326.879381-1-mlevitsk@redhat.com> References: <20201209203326.879381-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3a90ef2786..68c9182f92 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3847,12 +3847,14 @@ static int coroutine_fn qcow2_co_create_opts(BlockD= river *drv, =20 /* Create the qcow2 image (format layer) */ ret =3D qcow2_co_create(create_options, errp); +finish: if (ret < 0) { - goto finish; + bdrv_co_delete_file_noerr(bs); + bdrv_co_delete_file_noerr(data_bs); } =20 ret =3D 0; -finish: + qobject_unref(qdict); bdrv_unref(bs); bdrv_unref(data_bs); --=20 2.26.2