From nobody Thu May 2 16:06:05 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1512132890749660.6473186548965; Fri, 1 Dec 2017 04:54:50 -0800 (PST) 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 96C8A68C0; Fri, 1 Dec 2017 12:54:49 +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 6F04960F80; Fri, 1 Dec 2017 12:54:49 +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 291944BB79; Fri, 1 Dec 2017 12:54:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB1CsbLl010314 for ; Fri, 1 Dec 2017 07:54:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id BD77D5D6A8; Fri, 1 Dec 2017 12:54:37 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42B1B5D6A2 for ; Fri, 1 Dec 2017 12:54:37 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 1 Dec 2017 13:54:31 +0100 Message-Id: <5828740ced7cef724be240d4927e9f6383d80859.1512132834.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] security: introduce virSecurityManager(Set|Restore)ChardevLabel 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]); Fri, 01 Dec 2017 12:54:49 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" SELinux and DAC drivers already have both functions but they were not exported as public API of security manager. Signed-off-by: Pavel Hrdina --- src/libvirt_private.syms | 2 ++ src/security/security_dac.c | 3 +++ src/security/security_driver.h | 11 +++++++++++ src/security/security_manager.c | 40 ++++++++++++++++++++++++++++++++++++++ src/security/security_manager.h | 10 ++++++++++ src/security/security_nop.c | 20 +++++++++++++++++++ src/security/security_selinux.c | 3 +++ src/security/security_stack.c | 43 +++++++++++++++++++++++++++++++++++++= ++++ 8 files changed, 132 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 53057aa82e..de4ec4d442 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1276,6 +1276,7 @@ virSecurityManagerPreFork; virSecurityManagerReleaseLabel; virSecurityManagerReserveLabel; virSecurityManagerRestoreAllLabel; +virSecurityManagerRestoreChardevLabel; virSecurityManagerRestoreDiskLabel; virSecurityManagerRestoreHostdevLabel; virSecurityManagerRestoreImageLabel; @@ -1283,6 +1284,7 @@ virSecurityManagerRestoreInputLabel; virSecurityManagerRestoreMemoryLabel; virSecurityManagerRestoreSavedStateLabel; virSecurityManagerSetAllLabel; +virSecurityManagerSetChardevLabel; virSecurityManagerSetChildProcessLabel; virSecurityManagerSetDaemonSocketLabel; virSecurityManagerSetDiskLabel; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 52ca07a10f..609d2595b2 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -2155,4 +2155,7 @@ virSecurityDriver virSecurityDriverDAC =3D { .getBaseLabel =3D virSecurityDACGetBaseLabel, =20 .domainSetPathLabel =3D virSecurityDACDomainSetPathLab= el, + + .domainSetSecurityChardevLabel =3D virSecurityDACSetChardevLabel, + .domainRestoreSecurityChardevLabel =3D virSecurityDACRestoreChardevLa= bel, }; diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 1b3070d06d..47dad8ba20 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -140,6 +140,14 @@ typedef int (*virSecurityDomainRestoreInputLabel) (vir= SecurityManagerPtr mgr, typedef int (*virSecurityDomainSetPathLabel) (virSecurityManagerPtr mgr, virDomainDefPtr def, const char *path); +typedef int (*virSecurityDomainSetChardevLabel) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr = dev_source, + bool chardevStdioLogd); +typedef int (*virSecurityDomainRestoreChardevLabel) (virSecurityManagerPtr= mgr, + virDomainDefPtr def, + virDomainChrSourceDef= Ptr dev_source, + bool chardevStdioLogd= ); =20 =20 struct _virSecurityDriver { @@ -201,6 +209,9 @@ struct _virSecurityDriver { virSecurityDriverGetBaseLabel getBaseLabel; =20 virSecurityDomainSetPathLabel domainSetPathLabel; + + virSecurityDomainSetChardevLabel domainSetSecurityChardevLabel; + virSecurityDomainRestoreChardevLabel domainRestoreSecurityChardevLabel; }; =20 virSecurityDriverPtr virSecurityDriverLookup(const char *name, diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index 3cf12188a0..9249aba1fa 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -1152,3 +1152,43 @@ virSecurityManagerRestoreInputLabel(virSecurityManag= erPtr mgr, virReportUnsupportedError(); return -1; } + + +int +virSecurityManagerSetChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_source, + bool chardevStdioLogd) +{ + if (mgr->drv->domainSetSecurityChardevLabel) { + int ret; + virObjectLock(mgr); + ret =3D mgr->drv->domainSetSecurityChardevLabel(mgr, def, dev_sour= ce, + chardevStdioLogd); + virObjectUnlock(mgr); + return ret; + } + + virReportUnsupportedError(); + return -1; +} + + +int +virSecurityManagerRestoreChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_source, + bool chardevStdioLogd) +{ + if (mgr->drv->domainRestoreSecurityChardevLabel) { + int ret; + virObjectLock(mgr); + ret =3D mgr->drv->domainRestoreSecurityChardevLabel(mgr, def, dev_= source, + chardevStdioLogd= ); + virObjectUnlock(mgr); + return ret; + } + + virReportUnsupportedError(); + return -1; +} diff --git a/src/security/security_manager.h b/src/security/security_manage= r.h index 834c7f1593..013e3b9b18 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -184,4 +184,14 @@ int virSecurityManagerDomainSetPathLabel(virSecurityMa= nagerPtr mgr, virDomainDefPtr vm, const char *path); =20 +int virSecurityManagerSetChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_source, + bool chardevStdioLogd); + +int virSecurityManagerRestoreChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_sou= rce, + bool chardevStdioLogd); + #endif /* VIR_SECURITY_MANAGER_H__ */ diff --git a/src/security/security_nop.c b/src/security/security_nop.c index cfb032c686..ff739f8199 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -262,6 +262,23 @@ virSecurityDomainInputLabelNop(virSecurityManagerPtr m= gr ATTRIBUTE_UNUSED, return 0; } =20 +static int +virSecurityDomainSetChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainChrSourceDefPtr dev_source AT= TRIBUTE_UNUSED, + bool chardevStdioLogd ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int +virSecurityDomainRestoreChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUT= E_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUS= ED, + virDomainChrSourceDefPtr dev_sourc= e ATTRIBUTE_UNUSED, + bool chardevStdioLogd ATTRIBUTE_UN= USED) +{ + return 0; +} =20 virSecurityDriver virSecurityDriverNop =3D { .privateDataLen =3D 0, @@ -314,4 +331,7 @@ virSecurityDriver virSecurityDriverNop =3D { .domainGetSecurityMountOptions =3D virSecurityDomainGetMountOptio= nsNop, =20 .getBaseLabel =3D virSecurityGetBaseLabel, + + .domainSetSecurityChardevLabel =3D virSecurityDomainSetChardevLab= elNop, + .domainRestoreSecurityChardevLabel =3D virSecurityDomainRestoreCharde= vLabelNop, }; diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index b677fbcda7..0815a02d18 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -3095,4 +3095,7 @@ virSecurityDriver virSecurityDriverSELinux =3D { .getBaseLabel =3D virSecuritySELinuxGetBaseLabel, =20 .domainSetPathLabel =3D virSecuritySELinuxDomainSetPat= hLabel, + + .domainSetSecurityChardevLabel =3D virSecuritySELinuxSetChardevLa= bel, + .domainRestoreSecurityChardevLabel =3D virSecuritySELinuxRestoreChard= evLabel, }; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index cd916382b2..0375e7d89d 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -719,6 +719,46 @@ virSecurityStackDomainSetPathLabel(virSecurityManagerP= tr mgr, return rc; } =20 +static int +virSecurityStackDomainSetChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_source, + bool chardevStdioLogd) +{ + virSecurityStackDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); + virSecurityStackItemPtr item =3D priv->itemsHead; + int rc =3D 0; + + for (; item; item =3D item->next) { + if (virSecurityManagerSetChardevLabel(item->securityManager, + def, dev_source, + chardevStdioLogd) < 0) + rc =3D -1; + } + + return rc; +} + +static int +virSecurityStackDomainRestoreChardevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainChrSourceDefPtr dev_sou= rce, + bool chardevStdioLogd) +{ + virSecurityStackDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); + virSecurityStackItemPtr item =3D priv->itemsHead; + int rc =3D 0; + + for (; item; item =3D item->next) { + if (virSecurityManagerRestoreChardevLabel(item->securityManager, + def, dev_source, + chardevStdioLogd) < 0) + rc =3D -1; + } + + return rc; +} + virSecurityDriver virSecurityDriverStack =3D { .privateDataLen =3D sizeof(virSecurityStackData), .name =3D "stack", @@ -778,4 +818,7 @@ virSecurityDriver virSecurityDriverStack =3D { .getBaseLabel =3D virSecurityStackGetBaseLabel, =20 .domainSetPathLabel =3D virSecurityStackDomainSetPathL= abel, + + .domainSetSecurityChardevLabel =3D virSecurityStackDomainSetChard= evLabel, + .domainRestoreSecurityChardevLabel =3D virSecurityStackDomainRestoreC= hardevLabel, }; --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 16:06:05 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1512132893545291.8104444181673; Fri, 1 Dec 2017 04:54:53 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 422117CBA6; Fri, 1 Dec 2017 12:54:52 +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 20B3619E2B; Fri, 1 Dec 2017 12:54:52 +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 DC53D389D; Fri, 1 Dec 2017 12:54:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB1CscgE010325 for ; Fri, 1 Dec 2017 07:54:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8EF885D6A8; Fri, 1 Dec 2017 12:54:38 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 160855D6A2 for ; Fri, 1 Dec 2017 12:54:37 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 1 Dec 2017 13:54:32 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: fix security labeling for attach/detach of char devices 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 01 Dec 2017 12:54:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit e93d844b90 was not enough to fix the permission denied issue. We need to apply security labels as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1465833 Signed-off-by: Pavel Hrdina --- src/qemu/qemu_hotplug.c | 10 ++++++++ src/qemu/qemu_security.c | 60 ++++++++++++++++++++++++++++++++++++++++++++= ++++ src/qemu/qemu_security.h | 8 +++++++ 3 files changed, 78 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cbc7af59b7..6ef28bf051 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1815,6 +1815,7 @@ int qemuDomainAttachChrDevice(virConnectPtr conn, bool chardevAttached =3D false; bool teardowncgroup =3D false; bool teardowndevice =3D false; + bool teardownlabel =3D false; char *tlsAlias =3D NULL; char *secAlias =3D NULL; bool need_release =3D false; @@ -1835,6 +1836,10 @@ int qemuDomainAttachChrDevice(virConnectPtr conn, goto cleanup; teardowndevice =3D true; =20 + if (qemuSecuritySetChardevLabel(driver, vm, chr) < 0) + goto cleanup; + teardownlabel =3D true; + if (qemuSetupChardevCgroup(vm, chr) < 0) goto cleanup; teardowncgroup =3D true; @@ -1877,6 +1882,8 @@ int qemuDomainAttachChrDevice(virConnectPtr conn, qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fa= il"); + if (teardownlabel && qemuSecurityRestoreChardevLabel(driver, vm, c= hr) < 0) + VIR_WARN("Unable to restore security label on char device"); if (teardowndevice && qemuDomainNamespaceTeardownChardev(driver, v= m, chr) < 0) VIR_WARN("Unable to remove chr device from /dev"); } @@ -4154,6 +4161,9 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, if (qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Failed to remove chr device cgroup ACL"); =20 + if (qemuSecurityRestoreChardevLabel(driver, vm, chr) < 0) + VIR_WARN("Unable to restore security label on char device"); + if (qemuDomainNamespaceTeardownChardev(driver, vm, chr) < 0) VIR_WARN("Unable to remove chr device from /dev"); =20 diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index e7d2bbd5a3..2aced22d2d 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -364,3 +364,63 @@ qemuSecurityRestoreInputLabel(virDomainObjPtr vm, virSecurityManagerTransactionAbort(driver->securityManager); return ret; } + + +int +qemuSecuritySetChardevLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainChrDefPtr chr) +{ + int ret =3D -1; + qemuDomainObjPrivatePtr priv =3D vm->privateData; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerSetChardevLabel(driver->securityManager, + vm->def, + chr->source, + priv->chardevStdioLogd) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret =3D 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} + + +int +qemuSecurityRestoreChardevLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainChrDefPtr chr) +{ + int ret =3D -1; + qemuDomainObjPrivatePtr priv =3D vm->privateData; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerRestoreChardevLabel(driver->securityManager, + vm->def, + chr->source, + priv->chardevStdioLogd) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret =3D 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 76d63f06ec..d54ce6fead 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -76,6 +76,14 @@ int qemuSecuritySetInputLabel(virDomainObjPtr vm, int qemuSecurityRestoreInputLabel(virDomainObjPtr vm, virDomainInputDefPtr input); =20 +int qemuSecuritySetChardevLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainChrDefPtr chr); + +int qemuSecurityRestoreChardevLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainChrDefPtr chr); + /* Please note that for these APIs there is no wrapper yet. Do NOT blindly= add * new APIs here. If an API can touch a /dev file add a proper wrapper ins= tead. */ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list