]> xenbits.xensource.com Git - libvirt.git/commitdiff
selinux: Drop dead code in virSecuritySELinuxSetImageLabelInternal()
authorSergey Mironov <mironov@fintech.ru>
Wed, 11 Oct 2023 14:31:55 +0000 (17:31 +0300)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 20 Oct 2023 08:44:38 +0000 (10:44 +0200)
Considering that at the virSecuritySELinuxSetFilecon() function can only
return 0 or -1 and so does the virSecuritySELinuxFSetFilecon(), the check
for '1' at the end of virSecuritySELinuxSetImageLabelInternal() is
effectively a dead code. Drop it.

Co-developed-by: sdl.qemu <sdl.qemu@linuxtesting.org>
Signed-off-by: Sergey Mironov <mironov@fintech.ru>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/security/security_selinux.c

index 07d779a947ec45894e4403ac571d586c098f5696..84c5ce75ed8ecb40f9b62f8fbea974580411ee0a 100644 (file)
@@ -1988,17 +1988,6 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManager *mgr,
         ret = virSecuritySELinuxSetFilecon(mgr, path, use_label, remember);
     }
 
-    if (ret == 1 && !disk_seclabel) {
-        /* If we failed to set a label, but virt_use_nfs let us
-         * proceed anyway, then we don't need to relabel later.  */
-        disk_seclabel = virSecurityDeviceLabelDefNew(SECURITY_SELINUX_NAME);
-        if (!disk_seclabel)
-            return -1;
-        disk_seclabel->labelskip = true;
-        VIR_APPEND_ELEMENT(src->seclabels, src->nseclabels, disk_seclabel);
-        ret = 0;
-    }
-
     return ret;
 }