From nobody Mon May 13 05:05:09 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=1602411761; cv=none; d=zohomail.com; s=zohoarc; b=G8wz2yO50IfLZVvcJmiGTxogNKE9qtXLPPR5tNkn3ZicLyWzjk8XkafhdyywlEhef+FoLLJ565fD3N145N/pqF4YGTWc3M/qfg6nYFMyBjKsbxUiHVdlY4MXnoOxDQCK9mX95TsAb9kblgQeiszSE0ljV1tvUfMoKj5wqIt6cDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602411761; 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=bFOe0AKntJXd1DbWSJAKvmGw7n/k9PTEoCY1i1dOkWo=; b=Fc3DUpSYoEO2RPiMQ+uSp9FsfiwG7SBUktPMwlgklMeUdeMKbeLvfVCeb+UWd7uRfduUyeNDTEWAfPXzCKb0IJz2CsZ4kS5/FPdts+COYHshwWIxHcrnD1sH9AAY6A3pAHovdrRd396TYO+fOwrDuiWIe44uqFiZGn9t4MAR+70= 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 1602411761099208.08906123565987; Sun, 11 Oct 2020 03:22:41 -0700 (PDT) Received: from localhost ([::1]:38552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRYUx-00078D-4K for importer@patchew.org; Sun, 11 Oct 2020 06:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRYUA-00069A-Pg for qemu-devel@nongnu.org; Sun, 11 Oct 2020 06:21:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRYU8-0002iK-By for qemu-devel@nongnu.org; Sun, 11 Oct 2020 06:21:49 -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-353-Ye_PXnpoPMWomj0fql-UCQ-1; Sun, 11 Oct 2020 06:21:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69F5E64085; Sun, 11 Oct 2020 10:21:44 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B7BF60DA0; Sun, 11 Oct 2020 10:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602411707; 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=bFOe0AKntJXd1DbWSJAKvmGw7n/k9PTEoCY1i1dOkWo=; b=d9hurbdrvaIagOhVOc6Po2/YnN8/2l3t+YFNzhM+eLRNgG+IjfkaVarPqtAXvOGPp6njye RgAVB/pjxkrARx4ZOZVcBEKcgC7GTDoX1lTJxsZjFAO/lQPBRiBRXIIY14sFYSkgbXDMJC lC3hl6b+I3S7Gk/HGvrsjp/rBSMnfl0= X-MC-Unique: Ye_PXnpoPMWomj0fql-UCQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] crypto: luks: fix tiny memory leak Date: Sun, 11 Oct 2020 13:21:35 +0300 Message-Id: <20201011102136.622361-2-mlevitsk@redhat.com> In-Reply-To: <20201011102136.622361-1-mlevitsk@redhat.com> References: <20201011102136.622361-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/11 02:10:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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" In the case when underlying block device doesn't support the bdrv_co_delete_file interface, an 'Error' wasn't freed. Signed-off-by: Maxim Levitsky --- block/crypto.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/crypto.c b/block/crypto.c index 0807557763..9b61fd4aa8 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -736,6 +736,7 @@ fail: if ((r_del < 0) && (r_del !=3D -ENOTSUP)) { error_report_err(local_delete_err); } + error_free(local_delete_err); } =20 bdrv_unref(bs); --=20 2.26.2 From nobody Mon May 13 05:05:09 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=1602411850; cv=none; d=zohomail.com; s=zohoarc; b=ih2D/zlsyTTxWw+2BnEsuHpJHE8vUdJgoYSemd1Wr81zvq40oP8l7x0UuCV87TtR/gdkmZB+QViUx+UYjpMxoD6IFOp5j5GIWTjwkQ9pAxdDqdqPaadM0hmb9TkSYCLE1FsDIDS3RoY9zQ9I6WAwNTEXMqKAGaD8rz1c75zX3+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602411850; 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=WS7e9eNz1602z5VO6+Cnu6hlA9RATysActZiIZR+G9U=; b=Htazz5R13UPQtYTeta2sORwcaGSKFYQfLHDbVriF9x8D6TiEaDERuLlUwa9BidJNZjloLmlNH9C4HkRhykWxHHyggrDaEyGD4NuMa3jlOY92VhmQuYg43r45Eq72PoV77o1lqQ+1pGGSiUOEDQUi+/zAWiDwSL9fx4m976FOd+g= 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 160241185050186.87528237243737; Sun, 11 Oct 2020 03:24:10 -0700 (PDT) Received: from localhost ([::1]:42006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRYWP-00007W-8R for importer@patchew.org; Sun, 11 Oct 2020 06:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRYUC-0006AR-Nd for qemu-devel@nongnu.org; Sun, 11 Oct 2020 06:21:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRYUA-0002ik-Nj for qemu-devel@nongnu.org; Sun, 11 Oct 2020 06:21:52 -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-264-kWjCIBUJOyqhKlXgVWwvtg-1; Sun, 11 Oct 2020 06:21:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1DF5100746B; Sun, 11 Oct 2020 10:21:46 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id D32526EF55; Sun, 11 Oct 2020 10:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602411709; 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=WS7e9eNz1602z5VO6+Cnu6hlA9RATysActZiIZR+G9U=; b=D8Y5Q7EjctumjDUAYwSCvWVi/DBL1eGTblv7B5GPrrPAxeBQQdlQocFcNnK+chXz/1YBNy HWLJwlpAIC069nAeBSaleon9xcX2UP87TxFw3wleKUY4cTabOHroaT53TO+Mep9ui67RZT QgBPBhZicu947JkwftJZuQhI+mEDiAs= X-MC-Unique: kWjCIBUJOyqhKlXgVWwvtg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] block: qcow2: remove the created file on initialization error Date: Sun, 11 Oct 2020 13:21:36 +0300 Message-Id: <20201011102136.622361-3-mlevitsk@redhat.com> In-Reply-To: <20201011102136.622361-1-mlevitsk@redhat.com> References: <20201011102136.622361-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/11 06:21:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_H5=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" If the qcow initialization fails after we created the storage file, we should remove it to avoid leaving stale files around. We already do this for luks raw images. Signed-off-by: Maxim Levitsky --- block/qcow2.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index b05512718c..4dc6102df8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3834,6 +3834,18 @@ 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); + } + error_free(local_delete_err); goto finish; } =20 --=20 2.26.2