From nobody Tue Mar 3 03:04:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1772457397; cv=none; d=zohomail.com; s=zohoarc; b=VCRGRPls94Jct3XAgSePnn4GiTYIuNPLThJQcpU3BNXwl7EnEGJh2vFsTWj+4b60c3STHYpQxfOqAGsA0SOBiZnRnH2lSBarPmFt5esSirlTczV695JkXP2BjzNauTN9dQuljB5Vg0ZzKS15Fri1jyPlDlF0pja8l6wLFeqyZfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772457397; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=rKbngF2WDj+1jSljlZFujQZj3j/qVUFiuN04lOYwcKg=; b=Kro/UUCcRwJ5XTFT3Vf/jHlGyhIw66tqy3m+GqNfyRw3LOUH5myAlRW4mGM9z/fOwIAMzPTUdur762jdPxE0/uvsUKwCAyrveeQ1rdcyepcTBaCJ+m8aoTKVTiNskuok3kWAqbwzEJ4iBUpRLnYfFtQUdyYLo7/qt1m0XEf3J2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1772457397172485.5467276539415; Mon, 2 Mar 2026 05:16:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 39EEF41B0E; Mon, 2 Mar 2026 08:16:36 -0500 (EST) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D9F0741B6A; Mon, 2 Mar 2026 08:15:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0DA2F4189F; Mon, 2 Mar 2026 08:15:05 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8CB6B3F95F for ; Mon, 2 Mar 2026 08:15:04 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-GG7-E7kpNm-PvkuGG5f40A-1; Mon, 02 Mar 2026 08:15:02 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A5B04180063A for ; Mon, 2 Mar 2026 13:15:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.137]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DB2B41800576 for ; Mon, 2 Mar 2026 13:15:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772457304; h=from:from: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; bh=rKbngF2WDj+1jSljlZFujQZj3j/qVUFiuN04lOYwcKg=; b=hs3FYuPou2k98MtPyXH0hPCv0ZARQQy/8iCSypY1yYAVP9+7Ni7cDMbsTV4zq0H8AM/hju d3BX0v+6OinCdnhRCJNntXRvByg1keb/Of9yUesjNWyBInhyxQ4vqsQEgxwkGuF2vm4MOV I5O7E5CPmoLiPtfzY27CHAqC3uYRgh4= X-MC-Unique: GG7-E7kpNm-PvkuGG5f40A-1 X-Mimecast-MFC-AGG-ID: GG7-E7kpNm-PvkuGG5f40A_1772457301 To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/3] security_apparmor: Use g_auto* in AppArmorSetSecurityHostdevLabel Date: Mon, 2 Mar 2026 14:14:56 +0100 Message-ID: <62b67b87742b58f56b991adff4475868545a0ecb.1772457270.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7Pc8PkY2CfXgUHspS-tSfhImoBCeM96ehBWn6iXEelk_1772457301 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ECRMF7QX4OKXDZAY4DGVDEDC2FSVF64V X-Message-ID-Hash: ECRMF7QX4OKXDZAY4DGVDEDC2FSVF64V X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772457398285158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Pavel Hrdina Signed-off-by: Pavel Hrdina --- src/security/security_apparmor.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 6c5da2a650..74c5b10063 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -799,7 +799,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr, virDomainHostdevDef *dev, const char *vroot) { - struct SDPDOP *ptr; + g_autofree struct SDPDOP *ptr =3D NULL; int ret =3D -1; virSecurityLabelDef *secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); @@ -831,13 +831,12 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, =20 switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { - virUSBDevice *usb =3D + g_autoptr(virUSBDevice) usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot); if (!usb) goto done; =20 ret =3D virUSBDeviceFileIterate(usb, AppArmorSetSecurityUSBLabel, = ptr); - virUSBDeviceFree(usb); break; } =20 @@ -850,13 +849,12 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, =20 if (pcisrc->driver.name =3D=3D VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_= VFIO) { if (dev->source.subsys.u.pci.driver.iommufd !=3D VIR_TRISTATE_= BOOL_YES) { - char *vfioGroupDev =3D virPCIDeviceGetIOMMUGroupDev(pci); + g_autofree char *vfioGroupDev =3D virPCIDeviceGetIOMMUGrou= pDev(pci); =20 if (!vfioGroupDev) { goto done; } ret =3D AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr= ); - VIR_FREE(vfioGroupDev); } else { g_autofree char *vfiofdDev =3D NULL; =20 @@ -877,7 +875,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr, =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { virDomainHostdevSubsysSCSIHost *scsihostsrc =3D &scsisrc->u.host; - virSCSIDevice *scsi =3D + g_autoptr(virSCSIDevice) scsi =3D virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit, @@ -887,13 +885,11 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, goto done; =20 ret =3D virSCSIDeviceFileIterate(scsi, AppArmorSetSecuritySCSILabe= l, ptr); - virSCSIDeviceFree(scsi); - break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: { - virSCSIVHostDevice *host =3D virSCSIVHostDeviceNew(hostsrc->wwpn); + g_autoptr(virSCSIVHostDevice) host =3D virSCSIVHostDeviceNew(hosts= rc->wwpn); =20 if (!host) goto done; @@ -901,19 +897,16 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, ret =3D virSCSIVHostDeviceFileIterate(host, AppArmorSetSecurityHostLabel, ptr); - virSCSIVHostDeviceFree(host); break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: { - char *vfiodev =3D NULL; + g_autofree char *vfiodev =3D NULL; =20 if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) goto done; =20 ret =3D AppArmorSetSecurityHostdevLabelHelper(vfiodev, ptr); - - VIR_FREE(vfiodev); break; } =20 @@ -923,7 +916,6 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr, } =20 done: - VIR_FREE(ptr); return ret; } =20 --=20 2.53.0 From nobody Tue Mar 3 03:04:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1772457465; cv=none; d=zohomail.com; s=zohoarc; b=gjjVy+A5mdIX852+p1Hl5KUEG2MAIAhFacSujYT7vp4KAfrewGlLMgGJsjmkSudDFYP+Mpyqm39mjW+N0tVRoCqkAzJLJCHD6tOmlZeqbXxpR9eX2Ne6bycnkiIiWdqBSplbY/AdXnGSFie4zpZu1rpqkGOz4/Hvk5ccxiCYkEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772457465; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=5xLMefgE4DL4CZTHLVXoo/dxvwcDtgkAUggc1Ih8Y0E=; b=frJch9hpn7mkd/WItQpq64CD+e6Wd2Pf5U+2d0d1LefMStZBpXWiydsXqgjM4o816yz5APz36vP7j3bcHoc5/p6MdYyx3pVzV9DnMJFAELbjSqdfRINp0+dtO2GRt/Gffm3WnpRrqf1Rdu+9Zc4Yl72d1Z/GGbzVqMBVF63tJio= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 177245746484673.34666884044293; Mon, 2 Mar 2026 05:17:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id E6C3A41AC3; Mon, 2 Mar 2026 08:17:43 -0500 (EST) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B6E0E41C61; Mon, 2 Mar 2026 08:15:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 34F7B3F95F; Mon, 2 Mar 2026 08:15:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 833023F932 for ; Mon, 2 Mar 2026 08:15:05 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-74-s_uenPZZNyiV09uKpsHjTQ-1; Mon, 02 Mar 2026 08:15:03 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 06577195605A for ; Mon, 2 Mar 2026 13:15:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.137]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 02A9B1800576 for ; Mon, 2 Mar 2026 13:15:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772457305; h=from:from: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; bh=5xLMefgE4DL4CZTHLVXoo/dxvwcDtgkAUggc1Ih8Y0E=; b=dB4aHNXuSlmnO7diZ0KKVrRK3Xk5SmpnEjI1ihBCh14ojgK1U5DR0HSBFbmDhaLZQq6oyH MNhx7YhA00xoBapcSkdQHl5YtpzkCysr8aM8Ayda1Wf+7KZFrU7NLtQ+AYwoxzG5yV8czp isAHRTOihfC6+jaI9ZaEp/paYUxuY3E= X-MC-Unique: s_uenPZZNyiV09uKpsHjTQ-1 X-Mimecast-MFC-AGG-ID: s_uenPZZNyiV09uKpsHjTQ_1772457303 To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/3] security: Cleanup hostdev label error logic Date: Mon, 2 Mar 2026 14:14:57 +0100 Message-ID: <3e48d48435d7bcec6d7b14b5d84acb259e83abd6.1772457270.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iQd0JrPhsVaewxpEBtmFzXOd9VLxVd088OHgfTtigio_1772457303 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PJNDKKF4DKERWG2IR5BBDS5XY4VTJVRR X-Message-ID-Hash: PJNDKKF4DKERWG2IR5BBDS5XY4VTJVRR X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772457466809158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Pavel Hrdina Current code used mix of return, goto, break and setting ret variable. Simplify the logic to just return -1 on error. Signed-off-by: Pavel Hrdina --- src/security/security_apparmor.c | 56 +++++++++-------- src/security/security_dac.c | 103 ++++++++++++++++++------------- src/security/security_selinux.c | 87 ++++++++++++++------------ 3 files changed, 139 insertions(+), 107 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 74c5b10063..1c3496893c 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -800,7 +800,6 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr, const char *vroot) { g_autofree struct SDPDOP *ptr =3D NULL; - int ret =3D -1; virSecurityLabelDef *secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); virDomainHostdevSubsysUSB *usbsrc =3D &dev->source.subsys.u.usb; @@ -834,9 +833,10 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mg= r, g_autoptr(virUSBDevice) usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot); if (!usb) - goto done; + return -1; =20 - ret =3D virUSBDeviceFileIterate(usb, AppArmorSetSecurityUSBLabel, = ptr); + if (virUSBDeviceFileIterate(usb, AppArmorSetSecurityUSBLabel, ptr)= < 0) + return -1; break; } =20 @@ -845,30 +845,32 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, virPCIDeviceNew(&pcisrc->addr); =20 if (!pci) - goto done; + return -1; =20 if (pcisrc->driver.name =3D=3D VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_= VFIO) { if (dev->source.subsys.u.pci.driver.iommufd !=3D VIR_TRISTATE_= BOOL_YES) { g_autofree char *vfioGroupDev =3D virPCIDeviceGetIOMMUGrou= pDev(pci); =20 - if (!vfioGroupDev) { - goto done; - } - ret =3D AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr= ); + if (!vfioGroupDev) + return -1; + + if (AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr) < = 0) + return -1; } else { g_autofree char *vfiofdDev =3D NULL; =20 if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - goto done; + return -1; =20 - ret =3D AppArmorSetSecurityPCILabel(pci, vfiofdDev, ptr); - if (ret < 0) - goto done; + if (AppArmorSetSecurityPCILabel(pci, vfiofdDev, ptr) < 0) + return -1; =20 - ret =3D AppArmorSetSecurityPCILabel(pci, VIR_IOMMU_DEV_PAT= H, ptr); + if (AppArmorSetSecurityPCILabel(pci, VIR_IOMMU_DEV_PATH, p= tr) < 0) + return -1; } } else { - ret =3D virPCIDeviceFileIterate(pci, AppArmorSetSecurityPCILab= el, ptr); + if (virPCIDeviceFileIterate(pci, AppArmorSetSecurityPCILabel, = ptr) < 0) + return -1; } break; } @@ -881,10 +883,11 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, scsihostsrc->target, scsihostsrc->unit, dev->readonly, dev->shareable); =20 - if (!scsi) - goto done; + if (!scsi) + return -1; =20 - ret =3D virSCSIDeviceFileIterate(scsi, AppArmorSetSecuritySCSILabe= l, ptr); + if (virSCSIDeviceFileIterate(scsi, AppArmorSetSecuritySCSILabel, p= tr) < 0) + return -1; break; } =20 @@ -892,11 +895,13 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, g_autoptr(virSCSIVHostDevice) host =3D virSCSIVHostDeviceNew(hosts= rc->wwpn); =20 if (!host) - goto done; + return -1; =20 - ret =3D virSCSIVHostDeviceFileIterate(host, - AppArmorSetSecurityHostLabel, - ptr); + if (virSCSIVHostDeviceFileIterate(host, + AppArmorSetSecurityHostLabel, + ptr) < 0) { + return -1; + } break; } =20 @@ -904,19 +909,18 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *m= gr, g_autofree char *vfiodev =3D NULL; =20 if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) - goto done; + return -1; =20 - ret =3D AppArmorSetSecurityHostdevLabelHelper(vfiodev, ptr); + if (AppArmorSetSecurityHostdevLabelHelper(vfiodev, ptr) < 0) + return -1; break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret =3D 0; break; } =20 - done: - return ret; + return 0; } =20 =20 diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 390dfc7578..dc6dac0fb1 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1234,7 +1234,6 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr, virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *hostsrc =3D &dev->source.subsys.u.scs= i_host; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; - int ret =3D -1; =20 if (!priv->dynamicOwnership) return 0; @@ -1265,9 +1264,11 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mg= r, if (!(usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot))) return -1; =20 - ret =3D virUSBDeviceFileIterate(usb, - virSecurityDACSetUSBLabel, - &cbdata); + if (virUSBDeviceFileIterate(usb, + virSecurityDACSetUSBLabel, + &cbdata) < 0) { + return -1; + } break; } =20 @@ -1275,7 +1276,7 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr, g_autoptr(virPCIDevice) pci =3D NULL; =20 if (!virPCIDeviceExists(&pcisrc->addr)) - break; + return -1; =20 pci =3D virPCIDeviceNew(&pcisrc->addr); =20 @@ -1289,25 +1290,29 @@ virSecurityDACSetHostdevLabel(virSecurityManager *m= gr, if (!vfioGroupDev) return -1; =20 - ret =3D virSecurityDACSetHostdevLabelHelper(vfioGroupDev, - false, - &cbdata); + if (virSecurityDACSetHostdevLabelHelper(vfioGroupDev, + false, + &cbdata) < 0) { + return -1; + } } else { g_autofree char *vfiofdDev =3D NULL; =20 if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) return -1; =20 - ret =3D virSecurityDACSetHostdevLabelHelper(vfiofdDev, fal= se, &cbdata); - if (ret < 0) - break; + if (virSecurityDACSetHostdevLabelHelper(vfiofdDev, false, = &cbdata) < 0) + return -1; =20 - ret =3D virSecurityDACSetHostdevLabelHelper(VIR_IOMMU_DEV_= PATH, false, &cbdata); + if (virSecurityDACSetHostdevLabelHelper(VIR_IOMMU_DEV_PATH= , false, &cbdata) < 0) + return -1; } } else { - ret =3D virPCIDeviceFileIterate(pci, - virSecurityDACSetPCILabel, - &cbdata); + if (virPCIDeviceFileIterate(pci, + virSecurityDACSetPCILabel, + &cbdata) < 0) { + return -1; + } } break; } @@ -1323,9 +1328,11 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mg= r, if (!scsi) return -1; =20 - ret =3D virSCSIDeviceFileIterate(scsi, - virSecurityDACSetSCSILabel, - &cbdata); + if (virSCSIDeviceFileIterate(scsi, + virSecurityDACSetSCSILabel, + &cbdata) < 0) { + return -1; + } break; } =20 @@ -1335,9 +1342,11 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mg= r, if (!host) return -1; =20 - ret =3D virSCSIVHostDeviceFileIterate(host, - virSecurityDACSetHostLabel, - &cbdata); + if (virSCSIVHostDeviceFileIterate(host, + virSecurityDACSetHostLabel, + &cbdata) < 0) { + return -1; + } break; } =20 @@ -1347,16 +1356,16 @@ virSecurityDACSetHostdevLabel(virSecurityManager *m= gr, if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) return -1; =20 - ret =3D virSecurityDACSetHostdevLabelHelper(vfiodev, false, &cbdat= a); + if (virSecurityDACSetHostdevLabelHelper(vfiodev, false, &cbdata) <= 0) + return -1; break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret =3D 0; break; } =20 - return ret; + return 0; } =20 =20 @@ -1414,7 +1423,6 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager = *mgr, virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *hostsrc =3D &dev->source.subsys.u.scs= i_host; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; - int ret =3D -1; =20 secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); =20 @@ -1441,7 +1449,8 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager = *mgr, if (!(usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot))) return -1; =20 - ret =3D virUSBDeviceFileIterate(usb, virSecurityDACRestoreUSBLabel= , mgr); + if (virUSBDeviceFileIterate(usb, virSecurityDACRestoreUSBLabel, mg= r) < 0) + return -1; break; } =20 @@ -1449,7 +1458,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager = *mgr, g_autoptr(virPCIDevice) pci =3D NULL; =20 if (!virPCIDeviceExists(&pcisrc->addr)) - break; + return -1; =20 pci =3D virPCIDeviceNew(&pcisrc->addr); =20 @@ -1463,24 +1472,29 @@ virSecurityDACRestoreHostdevLabel(virSecurityManage= r *mgr, if (!vfioGroupDev) return -1; =20 - ret =3D virSecurityDACRestoreFileLabelInternal(mgr, NULL, - vfioGroupDev, fal= se); + if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, + vfioGroupDev, f= alse) < 0) { + return -1; + } } else { g_autofree char *vfiofdDev =3D NULL; =20 if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) return -1; =20 - ret =3D virSecurityDACRestoreFileLabelInternal(mgr, NULL, - vfiofdDev, fa= lse); - if (ret < 0) - break; + if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, + vfiofdDev, fals= e) < 0) { + return -1; + } =20 - ret =3D virSecurityDACRestoreFileLabelInternal(mgr, NULL, - VIR_IOMMU_DEV= _PATH, false); + if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, + VIR_IOMMU_DEV_P= ATH, false) < 0) { + return -1; + } } } else { - ret =3D virPCIDeviceFileIterate(pci, virSecurityDACRestorePCIL= abel, mgr); + if (virPCIDeviceFileIterate(pci, virSecurityDACRestorePCILabel= , mgr) < 0) + return -1; } break; } @@ -1496,7 +1510,8 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager = *mgr, if (!scsi) return -1; =20 - ret =3D virSCSIDeviceFileIterate(scsi, virSecurityDACRestoreSCSILa= bel, mgr); + if (virSCSIDeviceFileIterate(scsi, virSecurityDACRestoreSCSILabel,= mgr) < 0) + return -1; break; } =20 @@ -1506,9 +1521,11 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager= *mgr, if (!host) return -1; =20 - ret =3D virSCSIVHostDeviceFileIterate(host, - virSecurityDACRestoreHostLabel, - mgr); + if (virSCSIVHostDeviceFileIterate(host, + virSecurityDACRestoreHostLabel, + mgr) < 0) { + return -1; + } break; } =20 @@ -1518,16 +1535,16 @@ virSecurityDACRestoreHostdevLabel(virSecurityManage= r *mgr, if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) return -1; =20 - ret =3D virSecurityDACRestoreFileLabelInternal(mgr, NULL, vfiodev,= false); + if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, vfiodev, fal= se) < 0) + return -1; break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret =3D 0; break; } =20 - return ret; + return 0; } =20 =20 diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 9c498ab5f8..94a796ec49 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2219,8 +2219,6 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityMa= nager *mgr, virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; virSecuritySELinuxCallbackData data =3D {.mgr =3D mgr, .def =3D def}; =20 - int ret =3D -1; - /* Like virSecuritySELinuxSetImageLabelInternal() for a networked * disk, do nothing for an iSCSI hostdev */ @@ -2241,7 +2239,8 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityMa= nager *mgr, if (!usb) return -1; =20 - ret =3D virUSBDeviceFileIterate(usb, virSecuritySELinuxSetUSBLabel= , &data); + if (virUSBDeviceFileIterate(usb, virSecuritySELinuxSetUSBLabel, &d= ata) < 0) + return -1; break; } =20 @@ -2249,7 +2248,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityMa= nager *mgr, g_autoptr(virPCIDevice) pci =3D NULL; =20 if (!virPCIDeviceExists(&pcisrc->addr)) - break; + return -1; =20 pci =3D virPCIDeviceNew(&pcisrc->addr); =20 @@ -2263,23 +2262,26 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurity= Manager *mgr, if (!vfioGroupDev) return -1; =20 - ret =3D virSecuritySELinuxSetHostdevLabelHelper(vfioGroupD= ev, - false, - &data); + if (virSecuritySELinuxSetHostdevLabelHelper(vfioGroupDev, + false, + &data) < 0) { + return -1; + } } else { g_autofree char *vfiofdDev =3D NULL; =20 if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) return -1; =20 - ret =3D virSecuritySELinuxSetHostdevLabelHelper(vfiofdDev,= false, &data); - if (ret) - break; + if (virSecuritySELinuxSetHostdevLabelHelper(vfiofdDev, fal= se, &data) < 0) + return -1; =20 - ret =3D virSecuritySELinuxSetHostdevLabelHelper(VIR_IOMMU_= DEV_PATH, false, &data); + if (virSecuritySELinuxSetHostdevLabelHelper(VIR_IOMMU_DEV_= PATH, false, &data) < 0) + return -1; } } else { - ret =3D virPCIDeviceFileIterate(pci, virSecuritySELinuxSetPCIL= abel, &data); + if (virPCIDeviceFileIterate(pci, virSecuritySELinuxSetPCILabel= , &data) < 0) + return -1; } break; } @@ -2296,9 +2298,11 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityM= anager *mgr, if (!scsi) return -1; =20 - ret =3D virSCSIDeviceFileIterate(scsi, - virSecuritySELinuxSetSCSILabel, - &data); + if (virSCSIDeviceFileIterate(scsi, + virSecuritySELinuxSetSCSILabel, + &data) < 0) { + return -1; + } break; } =20 @@ -2308,9 +2312,11 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityM= anager *mgr, if (!host) return -1; =20 - ret =3D virSCSIVHostDeviceFileIterate(host, - virSecuritySELinuxSetHostLabel, - &data); + if (virSCSIVHostDeviceFileIterate(host, + virSecuritySELinuxSetHostLabel, + &data) < 0) { + return -1; + } break; } =20 @@ -2318,18 +2324,18 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurity= Manager *mgr, g_autofree char *vfiodev =3D NULL; =20 if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) - return ret; + return -1; =20 - ret =3D virSecuritySELinuxSetHostdevLabelHelper(vfiodev, false, &d= ata); + if (virSecuritySELinuxSetHostdevLabelHelper(vfiodev, false, &data)= < 0) + return -1; break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret =3D 0; break; } =20 - return ret; + return 0; } =20 =20 @@ -2467,7 +2473,6 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *hostsrc =3D &dev->source.subsys.u.scs= i_host; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; - int ret =3D -1; =20 /* Like virSecuritySELinuxRestoreImageLabelInt() for a networked * disk, do nothing for an iSCSI hostdev @@ -2489,7 +2494,8 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, if (!usb) return -1; =20 - ret =3D virUSBDeviceFileIterate(usb, virSecuritySELinuxRestoreUSBL= abel, mgr); + if (virUSBDeviceFileIterate(usb, virSecuritySELinuxRestoreUSBLabel= , mgr) < 0) + return -1; break; } =20 @@ -2497,7 +2503,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, g_autoptr(virPCIDevice) pci =3D NULL; =20 if (!virPCIDeviceExists(&pcisrc->addr)) - break; + return -1; =20 pci =3D virPCIDeviceNew(&pcisrc->addr); =20 @@ -2511,21 +2517,23 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecu= rityManager *mgr, if (!vfioGroupDev) return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupD= ev, false, false); + if (virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, = false, false) < 0) + return -1; } else { g_autofree char *vfiofdDev =3D NULL; =20 if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfiofdDev,= false, false); - if (ret < 0) - break; + if (virSecuritySELinuxRestoreFileLabel(mgr, vfiofdDev, fal= se, false) < 0) + return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, VIR_IOMMU_= DEV_PATH, false, false); + if (virSecuritySELinuxRestoreFileLabel(mgr, VIR_IOMMU_DEV_= PATH, false, false) < 0) + return -1; } } else { - ret =3D virPCIDeviceFileIterate(pci, virSecuritySELinuxRestore= PCILabel, mgr); + if (virPCIDeviceFileIterate(pci, virSecuritySELinuxRestorePCIL= abel, mgr) < 0) + return -1; } break; } @@ -2541,7 +2549,8 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, if (!scsi) return -1; =20 - ret =3D virSCSIDeviceFileIterate(scsi, virSecuritySELinuxRestoreSC= SILabel, mgr); + if (virSCSIDeviceFileIterate(scsi, virSecuritySELinuxRestoreSCSILa= bel, mgr) < 0) + return -1; break; } =20 @@ -2551,9 +2560,11 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecur= ityManager *mgr, if (!host) return -1; =20 - ret =3D virSCSIVHostDeviceFileIterate(host, - virSecuritySELinuxRestoreHostL= abel, - mgr); + if (virSCSIVHostDeviceFileIterate(host, + virSecuritySELinuxRestoreHostLab= el, + mgr) < 0) { + return -1; + } break; } =20 @@ -2563,16 +2574,16 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecu= rityManager *mgr, if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfiodev, false, fa= lse); + if (virSecuritySELinuxRestoreFileLabel(mgr, vfiodev, false, false)= < 0) + return -1; break; } =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret =3D 0; break; } =20 - return ret; + return 0; } =20 =20 --=20 2.53.0 From nobody Tue Mar 3 03:04:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1772457530; cv=none; d=zohomail.com; s=zohoarc; b=XKjrKDchuD0GUyp1QcrQoHpi85Dokqi3tHPoxZMyi5GkAWvzeaLpgWPDSYjXsTpqlMWmOMOrmXUhJbF3dO0FA0fRSyym9fOFYiPAZErTjqrVY6S+c2eUZrXoSL0v/MgoUS54d6H2QRbTNd577GDndjkTfo76Hzxd6GftPbsh3ko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772457530; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=zOj3odxGxkGxd7GlyzQ5+fUN7Au+MxdgyuFeBcUoKvg=; b=DdBeC5FaT0G3GluB2E7005Jj3I0h/RKJVQa9lfSjRlM3jD0ZqCz8FdQu1YGwWVg45MRhwQx9RbK3kMYfkmHp+O8VynCKwtDi5CFq9VwnMV/hBKcsM5eXjIDnb0tx3czUCav4BG01OvVbOt4A/Dcyd2xXCuBYV3bnQFuZThJW0+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1772457530806208.95562693344652; Mon, 2 Mar 2026 05:18:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id EEF6B417CE; Mon, 2 Mar 2026 08:18:49 -0500 (EST) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id AD4E441CF3; Mon, 2 Mar 2026 08:15:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id CF01D41C99; Mon, 2 Mar 2026 08:15:14 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B29EC41935 for ; Mon, 2 Mar 2026 08:15:06 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-KpSZhVchPSOr0pzK9nLpoA-1; Mon, 02 Mar 2026 08:15:04 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 05CD918002EB for ; Mon, 2 Mar 2026 13:15:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.137]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 530D71800576 for ; Mon, 2 Mar 2026 13:15:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772457306; h=from:from: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; bh=zOj3odxGxkGxd7GlyzQ5+fUN7Au+MxdgyuFeBcUoKvg=; b=eSFlQVUxzXKW0ViGIqgi0tW+bM6oTHdTRNHW8bUUYu3KBAFBC3spR1R2K9HDJ3yOI4T9bX ofQIM8ENuODV6Q9Z2VAPsHB09GskQSpur+yQ7TtpDC/fH4yknhSddyL2Xs4OuJkrwTRgmJ mQJc782V9u9oiu1A8XpSw1RRCK8tPp8= X-MC-Unique: KpSZhVchPSOr0pzK9nLpoA-1 X-Mimecast-MFC-AGG-ID: KpSZhVchPSOr0pzK9nLpoA_1772457304 To: devel@lists.libvirt.org Subject: [libvirt PATCH 3/3] qemu: Fix IOMMUFD and VFIO security labels Date: Mon, 2 Mar 2026 14:14:58 +0100 Message-ID: <27a6674893d7f8e1c499d2d09e722d1c117fd8b6.1772457270.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 4ufLsVPvZ-CffIx2wNdQGSlaGOzdiLlMBuwAk3W2TU4_1772457304 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CAVPCDWRA4XD5Y3H6KOIKYATRVBV26C4 X-Message-ID-Hash: CAVPCDWRA4XD5Y3H6KOIKYATRVBV26C4 X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772457531107158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Pavel Hrdina When IOMMUFD support was introduced it incorrectly tried to lable `/dev/iommu` and `/dev/vfio/devices/vfioX` but they are not added to QEMU namespace because libvirt opens FDs and passes these FDs to QEMU. We need to label these FDs instead. Fixes: 7d2f91f9cb572ab95d0916bdd1a46dd198874529 Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 16 ++++++++++++---- src/qemu/qemu_process.h | 3 ++- src/security/security_apparmor.c | 12 ------------ src/security/security_dac.c | 27 --------------------------- src/security/security_selinux.c | 23 ----------------------- 6 files changed, 15 insertions(+), 68 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 40489b84db..b3f2a173a8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1613,7 +1613,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, } =20 if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { - if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + if (qemuProcessOpenVfioDeviceFd(vm, hostdev) < 0) goto error; =20 if (!priv->iommufdState) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a82ee4b15e..ab7cf03c0e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7728,13 +7728,16 @@ int qemuProcessOpenIommuFd(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; - int iommufd; + VIR_AUTOCLOSE iommufd =3D -1; =20 VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name); =20 if ((iommufd =3D virIOMMUFDOpenDevice()) < 0) return -1; =20 + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def= , iommufd) < 0) + return -1; + priv->iommufd =3D qemuFDPassDirectNew("iommufd", &iommufd); =20 return 0; @@ -7749,16 +7752,21 @@ qemuProcessOpenIommuFd(virDomainObj *vm) * Returns: 0 on success, -1 on failure */ int -qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev) +qemuProcessOpenVfioDeviceFd(virDomainObj *vm, + virDomainHostdevDef *hostdev) { + qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainHostdevPrivate *hostdevPriv =3D QEMU_DOMAIN_HOSTDEV_PRIVATE(= hostdev); virDomainHostdevSubsysPCI *pci =3D &hostdev->source.subsys.u.pci; g_autofree char *name =3D g_strdup_printf("hostdev-%s-fd", hostdev->in= fo->alias); - int vfioDeviceFd; + VIR_AUTOCLOSE vfioDeviceFd =3D -1; =20 if ((vfioDeviceFd =3D virPCIDeviceOpenVfioFd(&pci->addr)) < 0) return -1; =20 + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def= , vfioDeviceFd) < 0) + return -1; + hostdevPriv->vfioDeviceFd =3D qemuFDPassDirectNew(name, &vfioDeviceFd); =20 return 0; @@ -7776,7 +7784,7 @@ qemuProcessPrepareHostHostdev(virDomainObj *vm) case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { /* Open VFIO device FD */ - if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + if (qemuProcessOpenVfioDeviceFd(vm, hostdev) < 0) return -1; } break; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index fccd41e1a6..5874214596 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -136,7 +136,8 @@ int qemuProcessPrepareHostBackendChardevHotplug(virDoma= inObj *vm, =20 int qemuProcessOpenIommuFd(virDomainObj *vm); =20 -int qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev); +int qemuProcessOpenVfioDeviceFd(virDomainObj *vm, + virDomainHostdevDef *hostdev); =20 int qemuProcessPrepareHost(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 1c3496893c..40f13ec1a5 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -45,7 +45,6 @@ #include "virstring.h" #include "virscsi.h" #include "virmdev.h" -#include "viriommufd.h" =20 #define VIR_FROM_THIS VIR_FROM_SECURITY =20 @@ -856,17 +855,6 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mg= r, =20 if (AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr) < = 0) return -1; - } else { - g_autofree char *vfiofdDev =3D NULL; - - if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - return -1; - - if (AppArmorSetSecurityPCILabel(pci, vfiofdDev, ptr) < 0) - return -1; - - if (AppArmorSetSecurityPCILabel(pci, VIR_IOMMU_DEV_PATH, p= tr) < 0) - return -1; } } else { if (virPCIDeviceFileIterate(pci, AppArmorSetSecurityPCILabel, = ptr) < 0) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index dc6dac0fb1..5aa13741e6 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -41,7 +41,6 @@ #include "virscsivhost.h" #include "virstring.h" #include "virutil.h" -#include "viriommufd.h" =20 #define VIR_FROM_THIS VIR_FROM_SECURITY =20 @@ -1295,17 +1294,6 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mg= r, &cbdata) < 0) { return -1; } - } else { - g_autofree char *vfiofdDev =3D NULL; - - if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - return -1; - - if (virSecurityDACSetHostdevLabelHelper(vfiofdDev, false, = &cbdata) < 0) - return -1; - - if (virSecurityDACSetHostdevLabelHelper(VIR_IOMMU_DEV_PATH= , false, &cbdata) < 0) - return -1; } } else { if (virPCIDeviceFileIterate(pci, @@ -1476,21 +1464,6 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager= *mgr, vfioGroupDev, f= alse) < 0) { return -1; } - } else { - g_autofree char *vfiofdDev =3D NULL; - - if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - return -1; - - if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, - vfiofdDev, fals= e) < 0) { - return -1; - } - - if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, - VIR_IOMMU_DEV_P= ATH, false) < 0) { - return -1; - } } } else { if (virPCIDeviceFileIterate(pci, virSecurityDACRestorePCILabel= , mgr) < 0) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 94a796ec49..89546e3316 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -41,7 +41,6 @@ #include "virconf.h" #include "virtpm.h" #include "virstring.h" -#include "viriommufd.h" =20 #define VIR_FROM_THIS VIR_FROM_SECURITY =20 @@ -2267,17 +2266,6 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityM= anager *mgr, &data) < 0) { return -1; } - } else { - g_autofree char *vfiofdDev =3D NULL; - - if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - return -1; - - if (virSecuritySELinuxSetHostdevLabelHelper(vfiofdDev, fal= se, &data) < 0) - return -1; - - if (virSecuritySELinuxSetHostdevLabelHelper(VIR_IOMMU_DEV_= PATH, false, &data) < 0) - return -1; } } else { if (virPCIDeviceFileIterate(pci, virSecuritySELinuxSetPCILabel= , &data) < 0) @@ -2519,17 +2507,6 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecur= ityManager *mgr, =20 if (virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, = false, false) < 0) return -1; - } else { - g_autofree char *vfiofdDev =3D NULL; - - if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0) - return -1; - - if (virSecuritySELinuxRestoreFileLabel(mgr, vfiofdDev, fal= se, false) < 0) - return -1; - - if (virSecuritySELinuxRestoreFileLabel(mgr, VIR_IOMMU_DEV_= PATH, false, false) < 0) - return -1; } } else { if (virPCIDeviceFileIterate(pci, virSecuritySELinuxRestorePCIL= abel, mgr) < 0) --=20 2.53.0