From nobody Tue Feb 10 03:45:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1649423588; cv=none; d=zohomail.com; s=zohoarc; b=eDBnvTasq+DeWYlTLq4WCBFZQ4Hl8EsW4N+Q1lQz9EGP1YtUj73fHFV37dRA0TiyK/6e4LvJSPqvQBWl6l1se/FEWeSaDtlTg1Em+AZAjxnQixwMVtCIq5ONfA6X3dJN7nadEU9tyIfoNFU/OptXRIa8J1T9bJuxwN8bs11+nnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649423588; 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=/0Rz5XSi8NpKctr8yB8glV4dbx53e0pD2A3tzpS9AKw=; b=NxodEVYMKtQIvmC/77nowY/qbJrAmgJsCMd9LIl6L7yEj7jId4g31TJliCI6f2HqgwyXxwx6OUARyF6Y7/jcPkZ3xdBqW+zL7vIAiQ9nWJiqn72xqLrZe9+I5BD6BxIJdKFEkkJHEkd44BiO5o436iMnZjMaQZEzy6FqAEiCWls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1649423588191538.5299427456735; Fri, 8 Apr 2022 06:13:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-91-nlR3qhbDPOCn5WcYokc7iw-1; Fri, 08 Apr 2022 09:13:00 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC64A1014A6B; Fri, 8 Apr 2022 13:12:54 +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 62D3C403367; Fri, 8 Apr 2022 13:12:54 +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 05888194034D; 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 679321940350 for ; Fri, 8 Apr 2022 13:12:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4566E416156; Fri, 8 Apr 2022 13:12:52 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id CACD740316C; 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=1649423587; 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=/0Rz5XSi8NpKctr8yB8glV4dbx53e0pD2A3tzpS9AKw=; b=F3MESM7vV9/gq13UNlmx9txzvj3e9wpKoRdmOAdwgxQZ41w27JrRoYD4ocgiDDOZ2eYPpr wImOGB1/lAt70KRnHbHRjLf3o42z1CqO0oU6eD4vXK5Q4KoWoREBDACIEEIhPHRuyUOr6/ 41z3GbOtCqGxOPMtnOs8oMSj08XVntU= X-MC-Unique: nlR3qhbDPOCn5WcYokc7iw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] virNWFilterDriverState: Destroy mutex safely Date: Fri, 8 Apr 2022 15:12:47 +0200 Message-Id: <20220408131248.48609-5-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.10 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: 1649423590382100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Allow nwfilterStateCleanupLocked to be called on a partially constructed driver object. This enables the next patch to simplify and fix error handling in nwfilterStateInitialize. Signed-off-by: Tim Wiederhake --- src/conf/virnwfilterobj.h | 1 + src/nwfilter/nwfilter_driver.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index cb103280e8..b67dc017c5 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -45,6 +45,7 @@ struct _virNWFilterDriverState { =20 /* Recursive. Hold for filter changes, instantiation or deletion */ virMutex updateLock; + bool updateLockInitialized; }; =20 virNWFilterDef * diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index f89b5b8757..bf17c5ea66 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -173,7 +173,8 @@ nwfilterStateCleanupLocked(void) /* free inactive nwfilters */ virNWFilterObjListFree(driver->nwfilters); =20 - virMutexDestroy(&driver->updateLock); + if (driver->updateLockInitialized) + virMutexDestroy(&driver->updateLock); g_clear_pointer(&driver, g_free); =20 return 0; @@ -222,6 +223,7 @@ nwfilterStateInitialize(bool privileged, if (virMutexInitRecursive(&driver->updateLock) < 0) goto err_free_driverstate; =20 + driver->updateLockInitialized =3D true; driver->privileged =3D privileged; =20 if (!(driver->nwfilters =3D virNWFilterObjListNew())) --=20 2.31.1