From nobody Sat Feb 7 09:04:01 2026 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=1607532465; cv=none; d=zohomail.com; s=zohoarc; b=j9A1dXK1k9woxjnK/9ms613WYbj9HvvJ7qwawk0UL6wMJImwonYWkyv285gwHXSOBY2OuxK2dCctI71qJ0SXRmRGaiT+YQO6XI1ku5dXS/wZR4HoZbJJ9kzTqSs7ncG23eOe3RCvnXH/7U4zJ7O/hI0paZb8OB5fM/veNbL2bbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607532465; 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=XcuwU0dOx50So0RmsZP2tDVq9STtWBPzuPjka6YVGDKt9EI5eUb233sV5bwwEII5jgTDM8u0K6zn9zxMyjx5G7BqMQOw9QuOTKkVgLao1sdiU0WMie74Wsvj6FU7MabKqr3274ODEtVESPFYZV0zkDrVgZAgFQV2kL3BlC9Tu28= 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 1607532465016368.77903308951136; Wed, 9 Dec 2020 08:47:45 -0800 (PST) Received: from localhost ([::1]:51142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2cv-00041V-En for importer@patchew.org; Wed, 09 Dec 2020 11:47:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aF-0002kS-Kr for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:44:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aC-0003IU-7W for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:44:55 -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-CAOij9UKOt2BMGcV1S5-2w-1; Wed, 09 Dec 2020 11:44:48 -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 7E7661005504; Wed, 9 Dec 2020 16:44:47 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 546BD63B8C; Wed, 9 Dec 2020 16:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532291; 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=i1hnYruppKArH81Sd6HLBYzNyx60K8HLZEWbFbnxZ3pq/100W22NgIJzikm1/I9Ax/DK/Q wEZFLJcQNlJ0HEviv68MgzJTigyftlWrs3LoJgq51Cl62a8nqunJrColCfc0NjEtO2hVAO e59W7DQDUE/JslkK1PsxmVIdr2THFtM= X-MC-Unique: CAOij9UKOt2BMGcV1S5-2w-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 1/4] crypto: luks: Fix tiny memory leak Date: Wed, 9 Dec 2020 18:44:38 +0200 Message-Id: <20201209164441.867945-2-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-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=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 Sat Feb 7 09:04:01 2026 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=1607541050; cv=none; d=zohomail.com; s=zohoarc; b=RVdPYNw7uO8zHGF+ue2UZi+jmeHBk37WwzYwqqkqEedpumLZA7yNJd1gcySLAtsb7Tb/P0flc6uR2iriayz7rA70wkyp7afzEj4RBJr81xe8Y/wvmHkn5nQrFfyDXDy6W4s3XGQwMuur4sPMLksEG4876zRTGz5I0uIWfnTL58o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607541050; 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=1MGdOSRuaY0jL7WFzslodoODfTjJHh5fpzO4HwJ4MUw=; b=a0j3pedsJwL8pFmAnQ9WyA0EBPfUQdQPgJqg27yua1KVyBVE3GgYtTtJTGqVjuvOfHFDenxlENCaI7bBmvAP30f1orPJO/NuUHZZ+dwhgzyOloz+6/+OwmfrnSSrzPpYonbop/o2N1X2ha9YEe1wCf1w5bx3n0ad1pBaKx2E0PQ= 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 1607541050602470.0889803179517; Wed, 9 Dec 2020 11:10:50 -0800 (PST) Received: from localhost ([::1]:58256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2gN-00079T-IC for importer@patchew.org; Wed, 09 Dec 2020 11:51:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aM-0002qq-Ej for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aG-0003K1-An for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:02 -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-426-5lylo0e5NHC-_B0wGT1jOg-1; Wed, 09 Dec 2020 11:44:51 -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 78FAA1842141; Wed, 9 Dec 2020 16:44:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A9FF1E5; Wed, 9 Dec 2020 16:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532295; 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=1MGdOSRuaY0jL7WFzslodoODfTjJHh5fpzO4HwJ4MUw=; b=YxN7oso8EOGGinmxmcRSCdTkKzKxCJTYCmgEFCgKoGnAy8v5DJwXX94XZbEHjbf+ruMoBA qgKYKCm6VrAtaoPupGW3tJZan2oBJj38WBRzhu2cLlW0Nb+w4j6rUyYxMkd4jbxLA871FV 9Nl2E01YZtyqsX5JSYHnm4tvKHiIZaw= X-MC-Unique: 5lylo0e5NHC-_B0wGT1jOg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 2/4] block: add bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 18:44:39 +0200 Message-Id: <20201209164441.867945-3-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-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, 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, T_SPF_TEMPERROR=0.01 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 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 --- block.c | 23 +++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 24 insertions(+) diff --git a/block.c b/block.c index f1cedac362..57e6d9750a 100644 --- a/block.c +++ b/block.c @@ -704,6 +704,29 @@ 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; + + if (!bs) { + return; + } + + int 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 Sat Feb 7 09:04:01 2026 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=1607547579; cv=none; d=zohomail.com; s=zohoarc; b=lGB5sNE6/Zm+4GQno54NWe1qtcZxeFWKqhrPFMRM1TtKUaXLUbN26RrSMwD/ae0ShkP0C4O4nHSfQWPZ2O25x7NoXb5dRcPwb21j0CTqgtymVyNrorDm5Q19jK9mDCIFwy6JHrIMA2stAFmt5O1X0psHvoSt9Si6WXQpROyOuj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547579; 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=H0bkLbIyLsag+SmCIrnZRq2F9E+rXmAY+pi4VsVrEP8=; b=Ta1J0OXdtVxWZwGX0jXxN9sRY0TG7Fdqiq5k/1yaBEfUQ9MAwQ6f+WBgaRAH6m3SCJFxV65tx/fFbG/p6Xi4lpGL2+YgZbmWUkgAD8MnnegGmfA50ifwY8ULeXsumMrmHqJMtd7OUoUqza55LNu+H0gpk3AHG0aD5HC3gD3VwU0= 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 1607547579836249.27274825142626; Wed, 9 Dec 2020 12:59:39 -0800 (PST) Received: from localhost ([::1]:36520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2ic-0001Pq-Ki for importer@patchew.org; Wed, 09 Dec 2020 11:53:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aO-0002sC-Mj for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aG-0003KK-Vw for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:04 -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-157-iMV9-93cOoCDtXBuPBcvFw-1; Wed, 09 Dec 2020 11:44:54 -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 71C091E7C7; Wed, 9 Dec 2020 16:44:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 137F15B4A8; Wed, 9 Dec 2020 16:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532296; 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=H0bkLbIyLsag+SmCIrnZRq2F9E+rXmAY+pi4VsVrEP8=; b=hXODD50TJ7HRJfPPKQMc2QWJMlTEbT8/vg0MBoDzRwO9O0isWI0Jf+7nDoR7SnnlCiiGCX JqDLnxDauyclmUprbfnbtCNosX//RTj20xB5tAmUdoz8GeBDK1D3ZfPgkRSB4kzkWS8OFO 8Jwrbk1nPuANd5eYXhWXHt1pUBJY3SA= X-MC-Unique: iMV9-93cOoCDtXBuPBcvFw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 3/4] crypto: luks: use bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 18:44:40 +0200 Message-Id: <20201209164441.867945-4-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-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" This refactoring is now possible thanks to this function. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia --- 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 Sat Feb 7 09:04:01 2026 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=1607547072; cv=none; d=zohomail.com; s=zohoarc; b=BqkToHk7/EsUi3nh6tY0I4qHgwlpI3XbMsxgfhN3OArN8S6b+4u7CCwBcA+s+UTcrUw5hukCpqjrVHvQZP43uE0fW8q4BWQx3C7o1tLWAX4EncV7FOX+mEV2MtIpVaJgcN9Cco7SD6Q9Lp3xU4odYjsSRt4q6M0bOQTT7Etnd4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547072; 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=a4W/YWZyMruDd+PDL9pTASZQ1DmhUkCYA5OLO0Cfa5U=; b=YaPANOh0dyIBTXx0zwMlGXCsyhFcH7wLt33j00gQnQHH/5BKLLqF+iPcFyMXl0BctaO/raLzneZFvLDLaOk1gDBqmWIaS3fj1PqXJ1vvgGuCiYwEdmXtfWG+kXuftf2KcLNmZo0+4g72YRJ/CtOUd5rSe+Eu23XK/8pgc3+DhUg= 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 1607547072392428.6762688868322; Wed, 9 Dec 2020 12:51:12 -0800 (PST) Received: from localhost ([::1]:58448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2gP-0007EM-H8 for importer@patchew.org; Wed, 09 Dec 2020 11:51:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aR-0002sS-7V for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aO-0003Nk-AW for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:07 -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-525-29ZIPZDzP0u_oZyRknXdrA-1; Wed, 09 Dec 2020 11:44:58 -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 6A5641842144; Wed, 9 Dec 2020 16:44:56 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C18A5B4A8; Wed, 9 Dec 2020 16:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532302; 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=a4W/YWZyMruDd+PDL9pTASZQ1DmhUkCYA5OLO0Cfa5U=; b=Hx2Xn52MokHdC/2iaOWRy9p4fKQASv9cXOEWusdnxfdMD61i9LiHlbLWvAfDAn9HygMse/ i5QwHIhfbTYW+Lr8n3oPBKAihTrldewMZ+L2IGYtWrhOUNQZfv+yIrR4n29Yq88BHAnvXN AoLHAarxDIbdJk5eb8HUsTLzPwvC8B4= X-MC-Unique: 29ZIPZDzP0u_oZyRknXdrA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 4/4] block: qcow2: remove the created file on initialization error Date: Wed, 9 Dec 2020 18:44:41 +0200 Message-Id: <20201209164441.867945-5-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3a90ef2786..b5169b7cad 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3847,12 +3847,13 @@ 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