From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052546; cv=none; d=zohomail.com; s=zohoarc; b=UXnY6981LjGcF6daympxvUE0CIYlSTagKHvhRthn4FAmBYU9zJE9NIYUC+myuTiCsd8nXMJpIUnQM8OI4X2FSVakPNR81O+x0nN2+woOC6LiYF4rGsVQTgah5+RG99d+Y+bqDflgnemJ/gwk1i5UzzVSq+XKrIMqOU4hEFxP21E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052546; 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=1PALZhzTZ/yxc7gxpribSfGldl+SWaMPLuS4AF6PbTk=; b=jaerBh6FjBE3R8U007gz75ZqSqeGdiFI0RPiDFIe1WakiAZBeplr89FpymAOxC9yBQujOge3fGYlaZuALVSkoiETaxTNdufHC4DAnCx/3EfWRh9fiXzPaCs7tNar7IJlkFnGC7JhbI0Rb3HEKijPAmQweI28houYOC1dPDPDRNM= 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 1585052546020600.6446142832392; Tue, 24 Mar 2020 05:22:26 -0700 (PDT) Received: from localhost ([::1]:47894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiZc-0005Pl-Ff for importer@patchew.org; Tue, 24 Mar 2020 08:22:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41128) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYD-00041O-CV for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYC-0007sA-DX for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:57 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:20244) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYC-0007rp-A9 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:56 -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-260-P_V8a761MNqStQBwKa3pdw-1; Tue, 24 Mar 2020 08:20:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98CBE801E67; Tue, 24 Mar 2020 12:20:50 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 338395D9E5; Tue, 24 Mar 2020 12:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052455; 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=1PALZhzTZ/yxc7gxpribSfGldl+SWaMPLuS4AF6PbTk=; b=FwvSB2F8kfZ9dbTdtzBk3UZWykVivy4JdJWxLq8YvKq7gArdUjKRVU88czynXF6yMGZXaI FfaV1Qp23sVRtQHqhPAgLYK5M5Uvuo9l5M7rBhFBbryy81gWQx6eHRYlbZs92crnlKHvef CTQddVQ3Y73MBy6DZYcUJ3WcWdW1EII= X-MC-Unique: P_V8a761MNqStQBwKa3pdw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 1/6] block: Avoid memleak on qcow2 image info failure Date: Tue, 24 Mar 2020 13:20:39 +0100 Message-Id: <20200324122044.1131326-2-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , Peter Maydell , qemu-devel@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" From: Eric Blake If we fail to get bitmap info, we must not leak the encryption info. Fixes: b8968c875f403 Fixes: Coverity CID 1421894 Signed-off-by: Eric Blake Message-Id: <20200320183620.1112123-1-eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Andrey Shinkevich Tested-by: Andrey Shinkevich Signed-off-by: Max Reitz --- block/qcow2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/qcow2.c b/block/qcow2.c index d44b45633d..e08917ed84 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4811,6 +4811,7 @@ static ImageInfoSpecific *qcow2_get_specific_info(Blo= ckDriverState *bs, if (local_err) { error_propagate(errp, local_err); qapi_free_ImageInfoSpecific(spec_info); + qapi_free_QCryptoBlockInfo(encrypt_info); return NULL; } *spec_info->u.qcow2.data =3D (ImageInfoSpecificQCow2){ --=20 2.25.1 From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052621; cv=none; d=zohomail.com; s=zohoarc; b=CYz2AROoSrKSSXHz1Z2vMVcHR5YN+r06rGyPIueyGDywSEVKUCd5xebyeazb1A9ZmKp4AvkO2yKBdCLhTzSzPY8hJM8pCYCKk5y7AI11UZVug6hGg4VZI6I9/y+VF8Gs7LiWX9C3w5xx4WkmY9QH4awIr20Ax4+T+8+B8mBDCgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052621; 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=NnS7vaFSkjphTxcTGdbglpjhLyF05h3cx+k7Q4E8TXg=; b=UMbvGbVX5qOm7mUpCwaGnT0WbBFPv/70t8NimujU5U0RoSzp4Dzt6PnpKaNfvbUrlCdbfVJOOcxeY7gqZvXWlmo9y99ODxCICKA6E5P31KXbxpYUkzFFuT4i9Kd790Ni5o6GeDFfB1qo9e32pBfhoSMuoR2bv9FvOtTNvvvghSY= 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 1585052621332561.3457967522385; Tue, 24 Mar 2020 05:23:41 -0700 (PDT) Received: from localhost ([::1]:47922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiap-0007bB-UB for importer@patchew.org; Tue, 24 Mar 2020 08:23:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41158) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYE-00042f-JI for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYD-0007sp-I2 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:58 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:37883) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYD-0007sY-E8 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:57 -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-69-RO_T6sxhMCOuPw_wKTjobQ-1; Tue, 24 Mar 2020 08:20:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9658800D50; Tue, 24 Mar 2020 12:20:53 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DEDF9497D; Tue, 24 Mar 2020 12:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052457; 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=NnS7vaFSkjphTxcTGdbglpjhLyF05h3cx+k7Q4E8TXg=; b=IqKVZidsgeo7Yo6lpopiXp8807FV0sdybsaVDRMyKBda9y7E1lY+zQz0Rt7hKBVd6fgJRQ 3AVf8Z1bjikOL5kZtOpx02QWEBhPSHvlp2leBljJISQO4xfsxBHvMdAzObwZMDrkMBNPDA U2QMAPW/YabIMZPfCLBS5czRBuDNP/0= X-MC-Unique: RO_T6sxhMCOuPw_wKTjobQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 2/6] block: Assert BlockDriver::format_name is not NULL Date: Tue, 24 Mar 2020 13:20:40 +0100 Message-Id: <20200324122044.1131326-3-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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 , Peter Maydell , qemu-devel@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" From: Philippe Mathieu-Daud=C3=A9 bdrv_do_find_format() calls strcmp() using BlockDriver::format_name as argument, which must not be NULL. Assert this field is not null when we register a block driver in bdrv_register(). Reported-by: Mansour Ahmadi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200318222235.23856-1-philmd@redhat.com> Reviewed-by: Alberto Garcia Signed-off-by: Max Reitz --- block.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block.c b/block.c index a2542c977b..6b984dc883 100644 --- a/block.c +++ b/block.c @@ -363,6 +363,7 @@ char *bdrv_get_full_backing_filename(BlockDriverState *= bs, Error **errp) =20 void bdrv_register(BlockDriver *bdrv) { + assert(bdrv->format_name); QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list); } =20 --=20 2.25.1 From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052640; cv=none; d=zohomail.com; s=zohoarc; b=Totwd6WHmqg6lz1CU9G/kVcfGvq769rgjqnrraoUciVw0oKDjjxV8axZVsbX5BB9ceBGPLXQVHUwNqedCOuBfOKlvGMCK6xlNAio/FODbzAvA0OArTcIcerHflWuqwUSh2Tv2ii7bJOfBt0TozIfc7oq1dZA2kTjPOXPNTRk0lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052640; 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=yNVzXAqjKE/6iQd4fcPucPVqAA77znoQ7wu4k+4CAmY=; b=esIeuF+PHqeO2z+O+VZaXF6D09vaiaCNWYBtIuBQYkP34M4D2PKcxC5FbkBw9oNjnKdgwwpA/dd42l/Lu4btTuYc7ezEwXT+MpV9jR32UzVxHPHEKL2cleZkbNXT/qNl8xsKWkVR7BYZTNhM6cOLjI8ayyV7EoW39/7jA9+P05A= 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 1585052640645519.4047456827105; Tue, 24 Mar 2020 05:24:00 -0700 (PDT) Received: from localhost ([::1]:47924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGib9-0007uo-86 for importer@patchew.org; Tue, 24 Mar 2020 08:23:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41190) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYH-00048l-HT for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYG-0007u0-1T for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:01 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:58551) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYF-0007tk-TL for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:20:59 -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-438-8zoWZ1YLNnyKMEWsEht85Q-1; Tue, 24 Mar 2020 08:20:57 -0400 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 C332F18A8C81; Tue, 24 Mar 2020 12:20:56 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3A7B6399; Tue, 24 Mar 2020 12:20:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052459; 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=yNVzXAqjKE/6iQd4fcPucPVqAA77znoQ7wu4k+4CAmY=; b=Vn5Dm3rR0QDctTF3jQhMINN01f16k07Y4MwG6mmhSIhfSc+2DzJJZQaDSXL7OeuxhQ3hdP Uw3h6z4IfQ7xoGrCrNm51GOXfHUdTIu1GYDoGUxrqJ1rsL4iZab3jFOKNH3qyAbRKzIREA fAlSItdU+IFMy80eg2+OmD6QWYMRX2M= X-MC-Unique: 8zoWZ1YLNnyKMEWsEht85Q-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 3/6] block: bdrv_set_backing_bs: fix use-after-free Date: Tue, 24 Mar 2020 13:20:41 +0100 Message-Id: <20200324122044.1131326-4-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , Peter Maydell , qemu-devel@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" From: Vladimir Sementsov-Ogievskiy There is a use-after-free possible: bdrv_unref_child() leaves bs->backing freed but not NULL. bdrv_attach_child may produce nested polling loop due to drain, than access of freed pointer is possible. I've produced the following crash on 30 iotest with modified code. It does not reproduce on master, but still seems possible: #0 __strcmp_avx2 () at /lib64/libc.so.6 #1 bdrv_backing_overridden (bs=3D0x55c9d3cc2060) at block.c:6350 #2 bdrv_refresh_filename (bs=3D0x55c9d3cc2060) at block.c:6404 #3 bdrv_backing_attach (c=3D0x55c9d48e5520) at block.c:1063 #4 bdrv_replace_child_noperm (child=3Dchild@entry=3D0x55c9d48e5520, new_bs=3Dnew_bs@entry=3D0x55c9d3cc2060) at block.c:2290 #5 bdrv_replace_child (child=3Dchild@entry=3D0x55c9d48e5520, new_bs=3Dnew_bs@entry=3D0x55c9d3cc2060) at block.c:2320 #6 bdrv_root_attach_child (child_bs=3Dchild_bs@entry=3D0x55c9d3cc2060, child_name=3Dchild_name@entry=3D0x55c9d241d478 "backing", child_role=3Dchild_role@entry=3D0x55c9d26ecee0 , ctx=3D, perm=3D, shared_perm=3D21, opaque=3D0x55c9d3c5a3d0, errp=3D0x7ffd117108e0) at block.c:2424 #7 bdrv_attach_child (parent_bs=3Dparent_bs@entry=3D0x55c9d3c5a3d0, child_bs=3Dchild_bs@entry=3D0x55c9d3cc2060, child_name=3Dchild_name@entry=3D0x55c9d241d478 "backing", child_role=3Dchild_role@entry=3D0x55c9d26ecee0 , errp=3Derrp@entry=3D0x7ffd117108e0) at block.c:5876 #8 in bdrv_set_backing_hd (bs=3Dbs@entry=3D0x55c9d3c5a3d0, backing_hd=3Dbacking_hd@entry=3D0x55c9d3cc2060, errp=3Derrp@entry=3D0x7ffd117108e0) at block.c:2576 #9 stream_prepare (job=3D0x55c9d49d84a0) at block/stream.c:150 #10 job_prepare (job=3D0x55c9d49d84a0) at job.c:761 #11 job_txn_apply (txn=3D, fn=3D) at job.c:145 #12 job_do_finalize (job=3D0x55c9d49d84a0) at job.c:778 #13 job_completed_txn_success (job=3D0x55c9d49d84a0) at job.c:832 #14 job_completed (job=3D0x55c9d49d84a0) at job.c:845 #15 job_completed (job=3D0x55c9d49d84a0) at job.c:836 #16 job_exit (opaque=3D0x55c9d49d84a0) at job.c:864 #17 aio_bh_call (bh=3D0x55c9d471a160) at util/async.c:117 #18 aio_bh_poll (ctx=3Dctx@entry=3D0x55c9d3c46720) at util/async.c:117 #19 aio_poll (ctx=3Dctx@entry=3D0x55c9d3c46720, blocking=3Dblocking@entry=3Dtrue) at util/aio-posix.c:728 #20 bdrv_parent_drained_begin_single (poll=3Dtrue, c=3D0x55c9d3d558f0) at block/io.c:121 #21 bdrv_parent_drained_begin_single (c=3Dc@entry=3D0x55c9d3d558f0, poll=3Dpoll@entry=3Dtrue) at block/io.c:114 #22 bdrv_replace_child_noperm (child=3Dchild@entry=3D0x55c9d3d558f0, new_bs=3Dnew_bs@entry=3D0x55c9d3d27300) at block.c:2258 #23 bdrv_replace_child (child=3Dchild@entry=3D0x55c9d3d558f0, new_bs=3Dnew_bs@entry=3D0x55c9d3d27300) at block.c:2320 #24 bdrv_root_attach_child (child_bs=3Dchild_bs@entry=3D0x55c9d3d27300, child_name=3Dchild_name@entry=3D0x55c9d241d478 "backing", child_role=3Dchild_role@entry=3D0x55c9d26ecee0 , ctx=3D, perm=3D, shared_perm=3D21, opaque=3D0x55c9d3cc2060, errp=3D0x7ffd11710c60) at block.c:2424 #25 bdrv_attach_child (parent_bs=3Dparent_bs@entry=3D0x55c9d3cc2060, child_bs=3Dchild_bs@entry=3D0x55c9d3d27300, child_name=3Dchild_name@entry=3D0x55c9d241d478 "backing", child_role=3Dchild_role@entry=3D0x55c9d26ecee0 , errp=3Derrp@entry=3D0x7ffd11710c60) at block.c:5876 #26 bdrv_set_backing_hd (bs=3Dbs@entry=3D0x55c9d3cc2060, backing_hd=3Dbacking_hd@entry=3D0x55c9d3d27300, errp=3Derrp@entry=3D0x7ffd11710c60) at block.c:2576 #27 stream_prepare (job=3D0x55c9d495ead0) at block/stream.c:150 ... Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200316060631.30052-2-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: John Snow Signed-off-by: Max Reitz --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 6b984dc883..cccae5add9 100644 --- a/block.c +++ b/block.c @@ -2760,10 +2760,10 @@ void bdrv_set_backing_hd(BlockDriverState *bs, Bloc= kDriverState *backing_hd, =20 if (bs->backing) { bdrv_unref_child(bs, bs->backing); + bs->backing =3D NULL; } =20 if (!backing_hd) { - bs->backing =3D NULL; goto out; } =20 --=20 2.25.1 From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052705; cv=none; d=zohomail.com; s=zohoarc; b=QyDciLwo8E7SpQ83xDvLzpZ1N0S1ZfG2M/bNYhW1WWdDSoI1l8diEB3Yxn83XBQR47PQKwW2OdpB5IfOLJVcjsrooyRYRiSxNnYvus6Im7txGnleB/L4gq512J4GP3WeTvgh6U+K+sLO4DtZc2/Ck6nRj+NXpGXTKgkgz6zFtFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052705; 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=llLnMhmoG5TK4ynfnTg6oU3Z5gaat0F1SGVz2j1BGnI=; b=MU/Sb3pNfuDUdSrSMeG93MPvhee+sLP5+URZghaDWfjnlEZer2Ll2vrIOFXBfnLo3dAqb8oDjYN1moNcPtcJNGIR6ew1+0TQaWuI0Xkvr2PqQvOhCsCOA5dCsMCRHBPG8/JnlMAhD/cMafjNxctLkH+Di1KZl8xst4J0znvbB1s= 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 1585052705958800.6291032167956; Tue, 24 Mar 2020 05:25:05 -0700 (PDT) Received: from localhost ([::1]:47938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGicC-0000sw-PJ for importer@patchew.org; Tue, 24 Mar 2020 08:25:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYN-0004EI-0F for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYL-0007w0-S8 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:06 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:23359) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYL-0007vd-Nb for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:05 -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-26-JYgGq_RtMy2TOqkX2CgoiA-1; Tue, 24 Mar 2020 08:21:00 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D2FC718A8C86; Tue, 24 Mar 2020 12:20:59 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C6DE6EFB4; Tue, 24 Mar 2020 12:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052465; 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=llLnMhmoG5TK4ynfnTg6oU3Z5gaat0F1SGVz2j1BGnI=; b=ADjJJwxlHaDYsZU6RTV8+GcLZLB8vQ45PzT6dvnCizxksLCI+xeE6aWZiPRkejJ1kclIiC 144CssLcFgjRN05B5DuY0XifuNiZ8gOyNJwQ9sVuMpkCBguOPzS5cHN8wDiHDEvZapJ82i yO37zt4u98a+ad45sJZpYyoGQZz5tAc= X-MC-Unique: JYgGq_RtMy2TOqkX2CgoiA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 4/6] block/qcow2: zero data_file child after free Date: Tue, 24 Mar 2020 13:20:42 +0100 Message-Id: <20200324122044.1131326-5-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , Peter Maydell , qemu-devel@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" From: Vladimir Sementsov-Ogievskiy data_file being NULL doesn't seem to be a correct state, but it's better than dead pointer and simpler to debug. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200316060631.30052-3-vsementsov@virtuozzo.com> Reviewed-by: John Snow Signed-off-by: Max Reitz --- block/qcow2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index e08917ed84..d1da3d91db 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1758,6 +1758,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverStat= e *bs, QDict *options, g_free(s->image_data_file); if (has_data_file(bs)) { bdrv_unref_child(bs, s->data_file); + s->data_file =3D NULL; } g_free(s->unknown_header_fields); cleanup_unknown_header_ext(bs); @@ -2621,6 +2622,7 @@ static void qcow2_close(BlockDriverState *bs) =20 if (has_data_file(bs)) { bdrv_unref_child(bs, s->data_file); + s->data_file =3D NULL; } =20 qcow2_refcount_close(bs); --=20 2.25.1 From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052555; cv=none; d=zohomail.com; s=zohoarc; b=bBvn/yA++WAnlBmmpqp3yX0fy8NiNhDdOSAjId8FwQe0xTZPMnY7SB/CQsyc9o6CpcOLaflNkOF/Uk2CuB7OayB2s3jsUsSCodx4YLv4nnK+ev3YnPI22Yw15SElrRE0IxajhFFfOvTviqqU9d0mYKnenn7oo3hCT3pH0oxjWKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052555; 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=sdgB1cGP4lrDOWYdtizKh5IPnMWCdKyq0DPNZtkoOt0=; b=inhUylfduqfU4G7JIIY6vwpJSNj4h4Nl805pMhArKfCd+edOemBUWEB5TmG4NNYm72zf0ETF37vb6shYpPjyGM88saewWFUMoVAkTplEO6KXwS5/pv/taNuhmu8n4Kh197OdoANsBkNjKk0BiT2uYNeTYgGqftTZ9mR7qG6+rGc= 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 1585052555045493.2922611098122; Tue, 24 Mar 2020 05:22:35 -0700 (PDT) Received: from localhost ([::1]:47896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiZl-0005kO-QZ for importer@patchew.org; Tue, 24 Mar 2020 08:22:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41255) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYQ-0004Ji-KE for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYO-0007xZ-GC for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:09 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:24789) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYN-0007xO-P0 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:07 -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-89-Ai3zRmdWM1WtxMhj3HlVuw-1; Tue, 24 Mar 2020 08:21:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B3B78017CC; Tue, 24 Mar 2020 12:21:04 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6059C60BF3; Tue, 24 Mar 2020 12:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052467; 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=sdgB1cGP4lrDOWYdtizKh5IPnMWCdKyq0DPNZtkoOt0=; b=FtagiRGUJzFvLRDtCU+6WX1tGqUfEruSDBJ8m0iGNLRaGTpbpXzSN3mm7hnaDK8sstNjO0 Pj9cycn5TlYYGPjjz8uxPpP6qgBiMNHoFw9PJS5xwqaOLKNkNkxtBXEJz9FFZIxgWpkrnJ N6pn4J7XZp8ouiicE/c2Dghrb8iuUBY= X-MC-Unique: Ai3zRmdWM1WtxMhj3HlVuw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 5/6] iotests: Fix cleanup path in some tests Date: Tue, 24 Mar 2020 13:20:43 +0100 Message-Id: <20200324122044.1131326-6-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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 , Peter Maydell , qemu-devel@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" Some iotests leave behind some external data file when run for qcow2 with -o data_file. Fix that. Signed-off-by: Max Reitz Message-Id: <20200224171631.384314-1-mreitz@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Max Reitz --- tests/qemu-iotests/085 | 1 + tests/qemu-iotests/087 | 6 ++++++ tests/qemu-iotests/279 | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 46981dbb64..dd3c993a2d 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -39,6 +39,7 @@ SNAPSHOTS=3D10 _cleanup() { _cleanup_qemu + _cleanup_test_img for i in $(seq 1 ${SNAPSHOTS}) do _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}" diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index d6c8613419..bdfdad3454 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -26,6 +26,12 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + # get standard environment, filters and checks . ./common.rc . ./common.filter diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 index 30d29b1cb2..75a4747e6b 100755 --- a/tests/qemu-iotests/279 +++ b/tests/qemu-iotests/279 @@ -26,7 +26,7 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_IMG.mid" + _rm_test_img "$TEST_IMG.mid" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 --=20 2.25.1 From nobody Thu Mar 28 16:24:07 2024 Delivered-To: importer@patchew.org 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; 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=1585052719; cv=none; d=zohomail.com; s=zohoarc; b=BE64Q2nT0qy+vOdftqPVKMYsBPMuAkSh2bfUyEuuspyNnn+S+kIZJUXfggEFNZqIrIR2cbR/FeM8CWq1TIzWn/rlfOUKoFZv++MgZwYHTqDdoi+WapaEyi6/JZn/Idxa9PXIrsLsDMTz89vj41V0dpr2//KMfZzeJti+TS8AeHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585052719; 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=Ah8bOhnAqJ3nIIRfmGaTBRsQaL0HlDpJ9Py310uZSO4=; b=OnJ05BloOO80ZA0EvCY2LeVFOkHCb6H/wks6C9Q6YnymDjD/s0z5jCIuIBot3F2usiwpo9ck/uQ+soVNt3FJdR40dsxlWwnJh8uSJ1bQ40sb5N4Uhmdbhey/d1GJ/kqoSXMvt6aFr1JbMgmDEQdim7yy8pMrirdx6lmLoayRgL4= 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 1585052719170731.7100905178077; Tue, 24 Mar 2020 05:25:19 -0700 (PDT) Received: from localhost ([::1]:47940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGicP-0001Dw-Sf for importer@patchew.org; Tue, 24 Mar 2020 08:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41288) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiYU-0004Sm-Ft for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiYS-00082m-Jq for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:14 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:26131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGiYS-00082c-Fb for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:21:12 -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-80-6SJ05763MaS7xeNv8LIvjA-1; Tue, 24 Mar 2020 08:21:08 -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 938228017CC; Tue, 24 Mar 2020 12:21:07 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8B7FBBBC2; Tue, 24 Mar 2020 12:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585052472; 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=Ah8bOhnAqJ3nIIRfmGaTBRsQaL0HlDpJ9Py310uZSO4=; b=RwkpU1AJl5qZvwlyhM8EpumaHbg8v4Ey0R9cem9b2xqG5Py8QhK4RoyeJz472qo5uH8MWT hRGGT58gXXjLQIlDUfpX2EUoY1nPj/foXl7foMah3IP9bmc3emrnlf9bSwNoZaXT3TRw4F Ge/MqGIAKFE6QAcbuwQoIMr6EQVUDS8= X-MC-Unique: 6SJ05763MaS7xeNv8LIvjA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 6/6] iotests/026: Move v3-exclusive test to new file Date: Tue, 24 Mar 2020 13:20:44 +0100 Message-Id: <20200324122044.1131326-7-mreitz@redhat.com> In-Reply-To: <20200324122044.1131326-1-mreitz@redhat.com> References: <20200324122044.1131326-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , Peter Maydell , qemu-devel@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" data_file does not work with v2, and we probably want 026 to keep working for v2 images. Thus, open a new file for v3-exclusive error path test cases. Fixes: 81311255f217859413c94f2cd9cebf2684bbda94 (=E2=80=9Ciotests/026: Test EIO on allocation in a data-file=E2=80= =9D) Signed-off-by: Max Reitz Message-Id: <20200311140707.1243218-1-mreitz@redhat.com> Reviewed-by: John Snow Tested-by: John Snow Signed-off-by: Max Reitz --- tests/qemu-iotests/026 | 31 ----------- tests/qemu-iotests/026.out | 6 -- tests/qemu-iotests/026.out.nocache | 6 -- tests/qemu-iotests/289 | 89 ++++++++++++++++++++++++++++++ tests/qemu-iotests/289.out | 8 +++ tests/qemu-iotests/group | 1 + 6 files changed, 98 insertions(+), 43 deletions(-) create mode 100755 tests/qemu-iotests/289 create mode 100644 tests/qemu-iotests/289.out diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index b05a4692cf..b9713eb591 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -240,37 +240,6 @@ $QEMU_IO -c "write 0 $CLUSTER_SIZE" "$BLKDBG_TEST_IMG"= | _filter_qemu_io =20 _check_test_img =20 -echo -echo =3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D -echo - -# Similar test as the last one, except we test what happens when there -# is an error when writing to an external data file instead of when -# writing to a preallocated zero cluster -_make_test_img -o "data_file=3D$TEST_IMG.data_file" $CLUSTER_SIZE - -# Put blkdebug above the data-file, and a raw node on top of that so -# that blkdebug will see a write_aio event and emit an error -$QEMU_IO -c "write 0 $CLUSTER_SIZE" \ - "json:{ - 'driver': 'qcow2', - 'file': { 'driver': 'file', 'filename': '$TEST_IMG' }, - 'data-file': { - 'driver': 'raw', - 'file': { - 'driver': 'blkdebug', - 'config': '$TEST_DIR/blkdebug.conf', - 'image': { - 'driver': 'file', - 'filename': '$TEST_IMG.data_file' - } - } - } - }" \ - | _filter_qemu_io - -_check_test_img - # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index c1b3b58482..83989996ff 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -653,10 +653,4 @@ wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error No errors were found on the image. - -=3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D - -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1024 data_file=3DTEST_= DIR/t.IMGFMT.data_file -write failed: Input/output error -No errors were found on the image. *** done diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.ou= t.nocache index 8d5001648a..9359d26d7e 100644 --- a/tests/qemu-iotests/026.out.nocache +++ b/tests/qemu-iotests/026.out.nocache @@ -661,10 +661,4 @@ wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error No errors were found on the image. - -=3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D - -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1024 data_file=3DTEST_= DIR/t.IMGFMT.data_file -write failed: Input/output error -No errors were found on the image. *** done diff --git a/tests/qemu-iotests/289 b/tests/qemu-iotests/289 new file mode 100755 index 0000000000..1c11d4030e --- /dev/null +++ b/tests/qemu-iotests/289 @@ -0,0 +1,89 @@ +#!/usr/bin/env bash +# +# qcow2 v3-exclusive error path testing +# (026 tests paths common to v2 and v3) +# +# Copyright (C) 2020 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +seq=3D$(basename $0) +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm "$TEST_DIR/blkdebug.conf" + rm -f "$TEST_IMG.data_file" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.pattern + +_supported_fmt qcow2 +_supported_proto file +# This is a v3-exclusive test; +# As for data_file, error paths often very much depend on whether +# there is an external data file or not; so we create one exactly when +# we want to test it +_unsupported_imgopts 'compat=3D0.10' data_file + +echo +echo =3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D +echo + +cat > "$TEST_DIR/blkdebug.conf" <