From nobody Wed Apr 24 05:45:56 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