From nobody Sun Feb 8 19:25:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1535357374972352.7931500872263; Mon, 27 Aug 2018 01:09:34 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 05E1932B672; Mon, 27 Aug 2018 08:09:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A89CC51DFF; Mon, 27 Aug 2018 08:09:32 +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 55140181B9F3; Mon, 27 Aug 2018 08:09:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7R897wD032547 for ; Mon, 27 Aug 2018 04:09:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9F6682027056; Mon, 27 Aug 2018 08:09:07 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DF87202704E for ; Mon, 27 Aug 2018 08:09:05 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 27 Aug 2018 10:08:34 +0200 Message-Id: <480a216c0bbc4247cc349023c60e98c6db0deddc.1535356707.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 21/28] security_manager: Introduce virSecurityManagerLockCloseConn 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 27 Aug 2018 08:09:33 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is basically just a wrapper over virLockManagerCloseConn() so that no connection is left open when it shouldn't be. Signed-off-by: Michal Privoznik --- src/security/security_manager.c | 75 +++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 75 insertions(+) diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index caaff1f703..2238c75a5c 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -91,6 +91,56 @@ virSecurityManagerLockDispose(void *obj) } =20 =20 +static void +virSecurityManagerLockCloseConnLocked(virSecurityManagerLockPtr lock, + bool force) +{ + int rc; + + if (!lock) + return; + + while (!force && + lock->pathLocked) { + if (virCondWait(&lock->cond, &lock->parent.lock) < 0) { + VIR_WARN("Unable to wait on metadata condition"); + return; + } + } + + rc =3D virLockManagerCloseConn(lock->lock, 0); + if (rc < 0) + return; + if (rc > 0) + lock->lock =3D NULL; + + if (force) { + /* We've closed the connection. Wake up anybody who might be + * waiting. */ + lock->pathLocked =3D false; + virCondSignal(&lock->cond); + } +} + + +static void +virSecurityManagerLockCloseConn(virSecurityManagerLockPtr lock) +{ + if (!lock) + return; + + virObjectLock(lock); + + if (!lock->lock) + goto cleanup; + + virSecurityManagerLockCloseConnLocked(lock, false); + + cleanup: + virObjectUnlock(lock); +} + + static int virSecurityManagerOnceInit(void) { @@ -334,6 +384,7 @@ virSecurityManagerTransactionStart(virSecurityManagerPt= r mgr) virObjectLock(mgr); if (mgr->drv->transactionStart) ret =3D mgr->drv->transactionStart(mgr); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -362,6 +413,7 @@ virSecurityManagerTransactionCommit(virSecurityManagerP= tr mgr, virObjectLock(mgr); if (mgr->drv->transactionCommit) ret =3D mgr->drv->transactionCommit(mgr, pid); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -379,6 +431,7 @@ virSecurityManagerTransactionAbort(virSecurityManagerPt= r mgr) virObjectLock(mgr); if (mgr->drv->transactionAbort) mgr->drv->transactionAbort(mgr); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); } =20 @@ -487,6 +540,7 @@ virSecurityManagerRestoreDiskLabel(virSecurityManagerPt= r mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityDiskLabel(mgr, vm, disk); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -515,6 +569,7 @@ virSecurityManagerRestoreImageLabel(virSecurityManagerP= tr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityImageLabel(mgr, vm, src); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -532,6 +587,7 @@ virSecurityManagerSetDaemonSocketLabel(virSecurityManag= erPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityDaemonSocketLabel(mgr, vm); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -549,6 +605,7 @@ virSecurityManagerSetSocketLabel(virSecurityManagerPtr = mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecuritySocketLabel(mgr, vm); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -566,6 +623,7 @@ virSecurityManagerClearSocketLabel(virSecurityManagerPt= r mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainClearSecuritySocketLabel(mgr, vm); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -595,6 +653,7 @@ virSecurityManagerSetDiskLabel(virSecurityManagerPtr mg= r, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityDiskLabel(mgr, vm, disk); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -623,6 +682,7 @@ virSecurityManagerSetImageLabel(virSecurityManagerPtr m= gr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityImageLabel(mgr, vm, src); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -642,6 +702,7 @@ virSecurityManagerRestoreHostdevLabel(virSecurityManage= rPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityHostdevLabel(mgr, vm, dev, = vroot); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -661,6 +722,7 @@ virSecurityManagerSetHostdevLabel(virSecurityManagerPtr= mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityHostdevLabel(mgr, vm, dev, vroo= t); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -679,6 +741,7 @@ virSecurityManagerSetSavedStateLabel(virSecurityManager= Ptr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSavedStateLabel(mgr, vm, savefile); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -696,6 +759,7 @@ virSecurityManagerRestoreSavedStateLabel(virSecurityMan= agerPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSavedStateLabel(mgr, vm, savefile); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -939,6 +1003,7 @@ virSecurityManagerSetAllLabel(virSecurityManagerPtr mg= r, virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityAllLabel(mgr, vm, stdin_path, chardevStdioLogd); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -959,6 +1024,7 @@ virSecurityManagerRestoreAllLabel(virSecurityManagerPt= r mgr, virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityAllLabel(mgr, vm, migrated, chardevStdioLogd); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1140,6 +1206,7 @@ virSecurityManagerDomainSetPathLabel(virSecurityManag= erPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetPathLabel(mgr, vm, path, allowSubtree); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1167,6 +1234,7 @@ virSecurityManagerSetMemoryLabel(virSecurityManagerPt= r mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityMemoryLabel(mgr, vm, mem); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1195,6 +1263,7 @@ virSecurityManagerRestoreMemoryLabel(virSecurityManag= erPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityMemoryLabel(mgr, vm, mem); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1213,6 +1282,7 @@ virSecurityManagerSetInputLabel(virSecurityManagerPtr= mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityInputLabel(mgr, vm, input); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1231,6 +1301,7 @@ virSecurityManagerRestoreInputLabel(virSecurityManage= rPtr mgr, int ret; virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityInputLabel(mgr, vm, input); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1251,6 +1322,7 @@ virSecurityManagerSetChardevLabel(virSecurityManagerP= tr mgr, virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityChardevLabel(mgr, def, dev_sour= ce, chardevStdioLogd); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1271,6 +1343,7 @@ virSecurityManagerRestoreChardevLabel(virSecurityMana= gerPtr mgr, virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityChardevLabel(mgr, def, dev_= source, chardevStdioLogd= ); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); return ret; } @@ -1289,6 +1362,7 @@ virSecurityManagerSetTPMLabels(virSecurityManagerPtr = mgr, if (mgr->drv->domainSetSecurityTPMLabels) { virObjectLock(mgr); ret =3D mgr->drv->domainSetSecurityTPMLabels(mgr, vm); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); =20 return ret; @@ -1307,6 +1381,7 @@ virSecurityManagerRestoreTPMLabels(virSecurityManager= Ptr mgr, if (mgr->drv->domainRestoreSecurityTPMLabels) { virObjectLock(mgr); ret =3D mgr->drv->domainRestoreSecurityTPMLabels(mgr, vm); + virSecurityManagerLockCloseConn(mgr->lock); virObjectUnlock(mgr); =20 return ret; --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list