From nobody Tue Feb 10 03:45:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1649423583; cv=none; d=zohomail.com; s=zohoarc; b=JN0q8P52/4Bhz8dQ4E91eEAeG1StK0YIQhVDuX7IQHLTyn01OS6aOafz2I26x7X2OkHHXL2f8PUyagOw171j3lUYBtvzj46jXpszmj2q7JsekYQ+8n051I9zY2588eJyjMHiscsjUjirhHwqkjL3McQXEny8VMFvKPdXfDxn+Jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649423583; 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=N57m8FMubx3+0iuI0SjvKFNwic+HZqn5Ko/UwULpwjQ=; b=FaUen4m7a7rc08DMLYUqHVnP/yOdweto0HfYL2AYhOjniROywf1dMKs4Y0u/PtLHe1JGxAC6NBkLuCGZSJHB8nBzATmLwZ+wrb0SV4xm1kBsO56J+wS4YazMqR2Ry0n/Vded15F5BLBWBuyUYFK8obxcDPgIWLeBPcMdHkfK/vM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1649423583136107.76191822697695; Fri, 8 Apr 2022 06:13:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-m01nUlL4M4ywMrtn89VJfw-1; Fri, 08 Apr 2022 09:13:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 738C91C0906A; Fri, 8 Apr 2022 13:12:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61728145B97F; Fri, 8 Apr 2022 13:12:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 64DD4193F6DB; Fri, 8 Apr 2022 13:12:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A50D41940341 for ; Fri, 8 Apr 2022 13:12:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 91FB541636A; Fri, 8 Apr 2022 13:12:51 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2326B402D8F; Fri, 8 Apr 2022 13:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649423582; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=N57m8FMubx3+0iuI0SjvKFNwic+HZqn5Ko/UwULpwjQ=; b=jJPbdjKNzkP7Z0ZXZsBKvy8uEYCQyU/GrMrNsj42/90Sa1TjrN6Pw9ctsyhH/pXD6MXS0+ X+M691t7ctYPn2jC5n3P+Q09Z6Wx6y14L73zXnLqZBOR0IS9BeG375X4CEBCAFU8vEWlEH WAieMLHDVK+JSRXThO1JZIDfB1e1D9g= X-MC-Unique: m01nUlL4M4ywMrtn89VJfw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] nwfilterDriverRemoveDBusMatches: Prevent unsubscribing from null id Date: Fri, 8 Apr 2022 15:12:46 +0200 Message-Id: <20220408131248.48609-4-twiederh@redhat.com> In-Reply-To: <20220408131248.48609-1-twiederh@redhat.com> References: <20220408131248.48609-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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) X-ZM-MESSAGEID: 1649423584587100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Allow nwfilterDriverRemoveDBusMatches to be called without nwfilterDriverInstallDBusMatches being called previously. This enables a later patch to use nwfilterDriverRemoveDBusMatches as a cleanup function safely. Signed-off-by: Tim Wiederhake --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1f7d40e1b0..f89b5b8757 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -77,12 +77,19 @@ static unsigned int reloadID; static void nwfilterDriverRemoveDBusMatches(void) { - GDBusConnection *sysbus; + GDBusConnection *sysbus =3D virGDBusGetSystemBus(); =20 - sysbus =3D virGDBusGetSystemBus(); - if (sysbus) { + if (!sysbus) + return; + + if (restartID !=3D 0) { g_dbus_connection_signal_unsubscribe(sysbus, restartID); + restartID =3D 0; + } + + if (reloadID !=3D 0) { g_dbus_connection_signal_unsubscribe(sysbus, reloadID); + reloadID =3D 0; } } =20 --=20 2.31.1