From a97b42820808e8cc8e89e362efe1a53334c09d8c Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 11 Oct 2023 17:31:55 +0300 Subject: [PATCH] selinux: Drop dead code in virSecuritySELinuxSetImageLabelInternal() 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 Signed-off-by: Sergey Mironov Signed-off-by: Michal Privoznik --- src/security/security_selinux.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 07d779a947..84c5ce75ed 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -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; } -- 2.47.2