From nobody Mon Feb 9 10:27:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603849026; cv=none; d=zohomail.com; s=zohoarc; b=e9AXdCoUXmBynQCE4RDDh8vPlOUFV0P2fP7kJAp3Or7UVVdLK8EyKqytD4dQpuNGMxazQr3zlBFSLRZ+rMZ/3KUXDduazdTS3KA1+3KHyC2214cLBM6etaJj1xI8CiORoqXoZ1dRWSsowhiZLjBjRaspyuU/gL7kDk+6RNO7lR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603849026; h=Content-Type:Content-Transfer-Encoding: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=VKtbTN3vMaVM1U+n9sSJhNDUgP7di/KY44HzdEANQEk=; b=Gqv+Qq0NZDp7UUIdd0MgtxBVt5UI0SJVYeySXlXOBhskpopeYRTECAV3D5A9wQ4l4qPjCTrwDuSS9+T/X9j8X7APR69M4lDICxl3LKfmm5CJJrxVEu0IreohL4rL8rJByClA0hkl2Jhlxm6J8F3LhO09Mx+MJU8WcCHCy8PPxGk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603849026147986.3604186968507; Tue, 27 Oct 2020 18:37:06 -0700 (PDT) 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-555-EzsW8GrCPTu_Hp8Na12BiA-1; Tue, 27 Oct 2020 21:36:42 -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 090D91084D75; Wed, 28 Oct 2020 01:36:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC3F460C11; Wed, 28 Oct 2020 01:36:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A5C3DCF4B; Wed, 28 Oct 2020 01:36:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09S1a8pV028250 for ; Tue, 27 Oct 2020 21:36:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5EC9B5C22B; Wed, 28 Oct 2020 01:36:08 +0000 (UTC) Received: from vhost2.laine.org (ovpn-113-144.phx2.redhat.com [10.3.113.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 217BA5C22A for ; Wed, 28 Oct 2020 01:36:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603849025; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VKtbTN3vMaVM1U+n9sSJhNDUgP7di/KY44HzdEANQEk=; b=OgYK+edxzsP/0/kjlpbpRTeXMAE68T72DGBjpsvjF8B+4S3sXivbItOUDh4ieQkcP0p2PY FYFl4mISEMh+i/4NFTvyYS0EJi/g7HyJNcTl0iMZ8qaIGixAH2dRoCLEO1TAt7ZtcqSYxK wyGz/uLKKFZ5jQ0kzwBFYkkq2Vcy0iU= X-MC-Unique: EzsW8GrCPTu_Hp8Na12BiA-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 05/12] util: manually set dirp to NULL after closing in virCapabilitiesInitCache() Date: Tue, 27 Oct 2020 21:35:51 -0400 Message-Id: <20201028013558.424925-6-laine@redhat.com> In-Reply-To: <20201028013558.424925-1-laine@redhat.com> References: <20201028013558.424925-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In all uses of VIR_DIR_CLOSE() except one, the DIR* is never referenced after closing all the way until it goes out of scope. virCapabilitiesInitCaches(), however, reuses the same DIR* over and over in a loop, but due to having many error conditions that result in a goto out of the loop, it's not well suited to reducing the scope of the variable until we introduce a g_autoptr cleanup function for DIR*. In preparation for doing just that, we need to get rid of the side effect of VIR_DIR_CLOSE() setting the DIR* to NULL, so in this one case, let's manually set the DIR* to NULL. Then in an upcoming patch we can safely remove the side effect from VIR_DIR_CLOSE(). This extra/ugly bit of code is only temporary: once we introduce the g_autoptr cleanup function for DIR*, we will remove this manual close/clear completely anyway. Signed-off-by: Laine Stump --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 90ad4e0c13..18b2612d2e 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1865,6 +1865,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) path =3D g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH= , pos); =20 VIR_DIR_CLOSE(dirp); + dirp =3D NULL; =20 rv =3D virDirOpenIfExists(&dirp, path); if (rv < 0) --=20 2.26.2