From nobody Fri Nov 21 10:10:52 2025 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=1762883184; cv=none; d=zohomail.com; s=zohoarc; b=Wb/PzDjFcPRnWIeFfRU8P+NZ66TtA8OCbNxu3plDRqvcMrh1DeJuSxyNWSzkFKWi7s0GtnZP70OnvNifB/9KvsJBCWaSA2LsCZZEe2HrRDB3OH/7RA9NOW+e1dOioYH3wSEYPbeSUS8BzBXBNpnlcKPCu8qjGdUyYiB/IWL06RA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762883184; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=L53DdSMcMxK8CHA6tCGukVytsW17sbIaxC2E6eYKCDA=; b=XRqeS8jeavwHGMp0bWWA/i0obvD1kEqbUqryT958z70EVuetp2dNsY/QuDFbzE2GxtTyQWlzzVUUZp5Dzqp3GKEq5qSSexrgcYDzYX/evHV76GvACCP6aZJhqG45u4/P/6ooUi1RJRrNpEuXTHh860JZ1zOAsqH9aVseRAM0DTA= 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 1762883184454235.0728052523234; Tue, 11 Nov 2025 09:46:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 47A9B3F326; Tue, 11 Nov 2025 12:46:22 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 55B7C44940; Tue, 11 Nov 2025 12:40:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AE23344151; Tue, 11 Nov 2025 12:40:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 8F9F84417B for ; Tue, 11 Nov 2025 12:40: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-17-9MU6Qo6sOF6azM-1RY8mXw-1; Tue, 11 Nov 2025 12:40:03 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 E1FE91955F15 for ; Tue, 11 Nov 2025 17:40:02 +0000 (UTC) Received: from colepc.home (unknown [10.22.82.11]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B171195608E; Tue, 11 Nov 2025 17:40:02 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=1762882805; h=from:from: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; bh=L53DdSMcMxK8CHA6tCGukVytsW17sbIaxC2E6eYKCDA=; b=eJO6IgFsFu2CJtCVZr1WLgNz1NPQOQupdM5J9uCXIBsFgS27qVlGx4GEe1yI2f+ifhawlV vdQsl4M9oWfSbCm7xq5G1x1X8tqL0pjd1P9WrSrhXR2Mev8T7KG+8GsYQ5siyKKzV9PpXH Ai2aur8h9oubPLDRsd/Ch+VSsLcTB+U= X-MC-Unique: 9MU6Qo6sOF6azM-1RY8mXw-1 X-Mimecast-MFC-AGG-ID: 9MU6Qo6sOF6azM-1RY8mXw_1762882803 To: devel@lists.libvirt.org Subject: [PATCH 3/4] selinux: Add is_shared plumbing to RestoreFileLabel Date: Tue, 11 Nov 2025 12:39:55 -0500 Message-ID: <148a1b4b88c87880fa2443d6144521c2f3a48299.1762881174.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JqRijD-RooymxpTyBJ3CGLICRdJ3GROz6jdAb1rKsJc_1762882803 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Q22PLUK5QNWYE4OQDOASAOURAQDXCDVJ X-Message-ID-Hash: Q22PLUK5QNWYE4OQDOASAOURAQDXCDVJ X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762883186494153000 Content-Type: text/plain; charset="utf-8" If set, we will skip fallback label restore attempts, if label remembering fails or isn't supported. This is a no-op, as every caller passes in `false` which matches existing behavior. Next patch will make use of it Signed-off-by: Cole Robinson --- src/security/security_selinux.c | 103 +++++++++++++++++++------------- 1 file changed, 61 insertions(+), 42 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 3a91ea46d3..898f253256 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -75,6 +75,7 @@ struct _virSecuritySELinuxContextItem { char *tcon; bool remember; /* Whether owner remembering should be done for @path/@= src */ bool restore; /* Whether current operation is 'set' or 'restore' */ + bool is_shared; /* @path is shared, so don't use fallback restore path= */ }; =20 typedef struct _virSecuritySELinuxContextList virSecuritySELinuxContextLis= t; @@ -115,7 +116,8 @@ virSecuritySELinuxContextListAppend(virSecuritySELinuxC= ontextList *list, const char *path, const char *tcon, bool remember, - bool restore) + bool restore, + bool is_shared) { virSecuritySELinuxContextItem *item =3D NULL; =20 @@ -126,6 +128,7 @@ virSecuritySELinuxContextListAppend(virSecuritySELinuxC= ontextList *list, =20 item->remember =3D remember; item->restore =3D restore; + item->is_shared =3D is_shared; =20 VIR_APPEND_ELEMENT(list->items, list->nItems, item); =20 @@ -172,7 +175,8 @@ static int virSecuritySELinuxTransactionAppend(const char *path, const char *tcon, bool remember, - bool restore) + bool restore, + bool is_shared) { virSecuritySELinuxContextList *list; =20 @@ -181,7 +185,7 @@ virSecuritySELinuxTransactionAppend(const char *path, return 0; =20 if (virSecuritySELinuxContextListAppend(list, path, tcon, - remember, restore) < 0) + remember, restore, is_shared) = < 0) return -1; =20 return 1; @@ -264,7 +268,8 @@ static int virSecuritySELinuxSetFilecon(virSecurityMana= ger *mgr, =20 static int virSecuritySELinuxRestoreFileLabel(virSecurityManager *mgr, const char *path, - bool recall); + bool recall, + bool is_shared); =20 =20 /** @@ -335,7 +340,8 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSE= D, } else { rv =3D virSecuritySELinuxRestoreFileLabel(list->manager, item->path, - remember); + remember, + item->is_shared); } =20 if (rv < 0) @@ -349,7 +355,8 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSE= D, if (!item->restore) { virSecuritySELinuxRestoreFileLabel(list->manager, item->path, - remember); + remember, + item->is_shared); } else { VIR_WARN("Ignoring failed restore attempt on %s", item->path); } @@ -1387,7 +1394,7 @@ virSecuritySELinuxSetFilecon(virSecurityManager *mgr, int ret =3D -1; =20 if ((rc =3D virSecuritySELinuxTransactionAppend(path, tcon, - remember, false)) < 0) + remember, false, false))= < 0) return -1; else if (rc > 0) return 0; @@ -1446,7 +1453,7 @@ virSecuritySELinuxSetFilecon(virSecurityManager *mgr, * this function. However, if our attempt fails, there's * not much we can do. XATTRs refcounting is fubar'ed and * the only option we have is warn users. */ - if (virSecuritySELinuxRestoreFileLabel(mgr, path, remember) < 0) + if (virSecuritySELinuxRestoreFileLabel(mgr, path, remember, false)= < 0) VIR_WARN("Unable to restore label on '%s'. " "XATTRs might have been left in inconsistent state.", path); @@ -1502,7 +1509,8 @@ getContext(virSecurityManager *mgr G_GNUC_UNUSED, static int virSecuritySELinuxRestoreFileLabel(virSecurityManager *mgr, const char *path, - bool recall) + bool recall, + bool is_shared) { bool privileged =3D virSecurityManagerGetPrivileged(mgr); struct stat buf; @@ -1527,7 +1535,8 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManager= *mgr, } =20 if ((rc =3D virSecuritySELinuxTransactionAppend(path, NULL, - recall, true)) < 0) { + recall, true, + is_shared)) < 0) { return -1; } else if (rc > 0) { return 0; @@ -1545,6 +1554,13 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManage= r *mgr, } =20 if (!recall || rc =3D=3D -2) { + /* if path is marked as shared (eg. using label virt_content_t), + * skip fallback labelling, which has race conditions with multiple + * VM startup: https://issues.redhat.com/browse/RHEL-126945 + */ + if (is_shared) + return 0; + if (stat(newpath, &buf) !=3D 0) { VIR_WARN("cannot stat %s: %s", newpath, g_strerror(errno)); @@ -1611,7 +1627,7 @@ virSecuritySELinuxRestoreInputLabel(virSecurityManage= r *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: case VIR_DOMAIN_INPUT_TYPE_EVDEV: - return virSecuritySELinuxRestoreFileLabel(mgr, input->source.evdev= , true); + return virSecuritySELinuxRestoreFileLabel(mgr, input->source.evdev= , true, false); =20 case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: @@ -1689,8 +1705,8 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManag= er *mgr, path =3D mem->source.virtio_pmem.path; break; case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_VEPC, true= ); - if (virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_PROVISION, tru= e) < 0) + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_VEPC, true= , false); + if (virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_PROVISION, tru= e, false) < 0) ret =3D -1; return ret; =20 @@ -1704,7 +1720,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManag= er *mgr, if (!path) return 0; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, path, true); + return virSecuritySELinuxRestoreFileLabel(mgr, path, true, false); } =20 =20 @@ -1773,10 +1789,10 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurit= yManager *mgr, switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: tpmdev =3D tpm->data.passthrough.source->data.file.path; - rc =3D virSecuritySELinuxRestoreFileLabel(mgr, tpmdev, false); + rc =3D virSecuritySELinuxRestoreFileLabel(mgr, tpmdev, false, fals= e); =20 if ((cancel_path =3D virTPMCreateCancelPath(tpmdev)) !=3D NULL) { - if (virSecuritySELinuxRestoreFileLabel(mgr, cancel_path, false= ) < 0) + if (virSecuritySELinuxRestoreFileLabel(mgr, cancel_path, false= , false) < 0) rc =3D -1; } break; @@ -1885,7 +1901,7 @@ virSecuritySELinuxRestoreImageLabelInt(virSecurityMan= ager *mgr, path =3D vfioGroupDev; } =20 - return virSecuritySELinuxRestoreFileLabel(mgr, path, true); + return virSecuritySELinuxRestoreFileLabel(mgr, path, true, false); } =20 =20 @@ -2385,7 +2401,7 @@ virSecuritySELinuxRestorePCILabel(virPCIDevice *dev G= _GNUC_UNUSED, { virSecurityManager *mgr =3D opaque; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, file, true); + return virSecuritySELinuxRestoreFileLabel(mgr, file, true, false); } =20 static int @@ -2395,7 +2411,7 @@ virSecuritySELinuxRestoreUSBLabel(virUSBDevice *dev G= _GNUC_UNUSED, { virSecurityManager *mgr =3D opaque; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, file, true); + return virSecuritySELinuxRestoreFileLabel(mgr, file, true, false); } =20 =20 @@ -2412,7 +2428,7 @@ virSecuritySELinuxRestoreSCSILabel(virSCSIDevice *dev, if (virSCSIDeviceGetShareable(dev) || virSCSIDeviceGetReadonly(dev)) return 0; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, file, true); + return virSecuritySELinuxRestoreFileLabel(mgr, file, true, false); } =20 static int @@ -2422,7 +2438,7 @@ virSecuritySELinuxRestoreHostLabel(virSCSIVHostDevice= *dev G_GNUC_UNUSED, { virSecurityManager *mgr =3D opaque; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, file, true); + return virSecuritySELinuxRestoreFileLabel(mgr, file, true, false); } =20 =20 @@ -2480,7 +2496,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, if (!vfioGroupDev) return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, = false); + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, = false, false); } else { ret =3D virPCIDeviceFileIterate(pci, virSecuritySELinuxRestore= PCILabel, mgr); } @@ -2520,7 +2536,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecuri= tyManager *mgr, if (!(vfiodev =3D virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuids= tr))) return -1; =20 - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfiodev, false); + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, vfiodev, false, fa= lse); break; } =20 @@ -2549,7 +2565,7 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= Manager *mgr, } else { path =3D g_strdup(dev->source.caps.u.storage.block); } - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true); + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true, false); break; } =20 @@ -2561,7 +2577,7 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= Manager *mgr, } else { path =3D g_strdup(dev->source.caps.u.misc.chardev); } - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true); + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true, false); break; } =20 @@ -2631,7 +2647,7 @@ virSecuritySELinuxRestoreSavedStateLabel(virSecurityM= anager *mgr, if (!secdef || !secdef->relabel) return 0; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, savefile, false); + return virSecuritySELinuxRestoreFileLabel(mgr, savefile, false, false); } =20 =20 @@ -2748,7 +2764,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= ger *mgr, case VIR_DOMAIN_CHR_TYPE_FILE: if (virSecuritySELinuxRestoreFileLabel(mgr, dev_source->data.file.path, - true) < 0) + true, + false) < 0) return -1; =20 break; @@ -2757,7 +2774,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= ger *mgr, if (!dev_source->data.nix.listen) { if (virSecuritySELinuxRestoreFileLabel(mgr, dev_source->data.nix.pa= th, - true) < 0) + true, + false) < 0) return -1; } =20 @@ -2767,14 +2785,15 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMa= nager *mgr, g_autofree char *out =3D g_strdup_printf("%s.out", dev_source->dat= a.file.path); g_autofree char *in =3D g_strdup_printf("%s.in", dev_source->data.= file.path); if (virFileExists(in) && virFileExists(out)) { - if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true) < 0) || - (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) + if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true, false)= < 0) || + (virSecuritySELinuxRestoreFileLabel(mgr, in, true, false) = < 0)) return -1; =20 } else { if (virSecuritySELinuxRestoreFileLabel(mgr, dev_source->data.file.p= ath, - true) < 0) + true, + false) < 0) return -1; } } @@ -2822,7 +2841,7 @@ virSecuritySELinuxRestoreSecuritySmartcardCallback(vi= rDomainDef *def, database =3D dev->data.cert.database; if (!database) database =3D VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE; - return virSecuritySELinuxRestoreFileLabel(mgr, database, true); + return virSecuritySELinuxRestoreFileLabel(mgr, database, true, fal= se); =20 case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: return virSecuritySELinuxRestoreChardevLabel(mgr, def, @@ -2859,7 +2878,7 @@ virSecuritySELinuxRestoreSysinfoLabel(virSecurityMana= ger *mgr, virSysinfoFWCfgDef *f =3D &def->fw_cfgs[i]; =20 if (f->file && - virSecuritySELinuxRestoreFileLabel(mgr, f->file, true) < 0) + virSecuritySELinuxRestoreFileLabel(mgr, f->file, true, false) = < 0) return -1; } =20 @@ -2955,28 +2974,28 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManage= r *mgr, } =20 if (def->os.kernel && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.kernel, true) < 0) + virSecuritySELinuxRestoreFileLabel(mgr, def->os.kernel, true, fals= e) < 0) rc =3D -1; =20 if (def->os.initrd && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.initrd, true) < 0) + virSecuritySELinuxRestoreFileLabel(mgr, def->os.initrd, true, fals= e) < 0) rc =3D -1; =20 if (def->os.shim && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.shim, true) < 0) + virSecuritySELinuxRestoreFileLabel(mgr, def->os.shim, true, false)= < 0) rc =3D -1; =20 if (def->os.dtb && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb, true) < 0) + virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb, true, false) = < 0) rc =3D -1; =20 for (i =3D 0; i < def->os.nacpiTables; i++) { - if (virSecuritySELinuxRestoreFileLabel(mgr, def->os.acpiTables[i]-= >path, true) < 0) + if (virSecuritySELinuxRestoreFileLabel(mgr, def->os.acpiTables[i]-= >path, true, false) < 0) rc =3D -1; } =20 if (def->pstore && - virSecuritySELinuxRestoreFileLabel(mgr, def->pstore->path, true) <= 0) + virSecuritySELinuxRestoreFileLabel(mgr, def->pstore->path, true, f= alse) < 0) rc =3D -1; =20 return rc; @@ -3589,7 +3608,7 @@ virSecuritySELinuxDomainRestorePathLabel(virSecurityM= anager *mgr, if (!secdef || !secdef->relabel) return 0; =20 - return virSecuritySELinuxRestoreFileLabel(mgr, path, true); + return virSecuritySELinuxRestoreFileLabel(mgr, path, true, false); } =20 =20 @@ -3657,7 +3676,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManage= r *mgr, struct dirent *ent; g_autoptr(DIR) dir =3D NULL; =20 - if ((ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true))) + if ((ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true, false= ))) return ret; =20 if (!virFileIsDir(path)) @@ -3668,7 +3687,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManage= r *mgr, =20 while ((ret =3D virDirRead(dir, &ent, path)) > 0) { g_autofree char *filename =3D g_strdup_printf("%s/%s", path, ent->= d_name); - ret =3D virSecuritySELinuxRestoreFileLabel(mgr, filename, true); + ret =3D virSecuritySELinuxRestoreFileLabel(mgr, filename, true, fa= lse); if (ret < 0) break; } --=20 2.51.1