[PATCH 5/5] security: Remove unnecessary checks for mgr == NULL

[John Ferlan <jferlan@xxxxxxxxxx>]

Coverity found the DACGenLabel was checking for mgr == NULL after a
possible dereference; however, in order to get into the function the
virSecurityManagerGenLabel would have already dereferenced sec_managers[i]
so the check was unnecessary. Same check is made in SELinuxGenSecurityLabel.
---
 src/security/security_dac.c     | 6 ------
 src/security/security_selinux.c | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index b115bb0..0b274b7 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -913,12 +913,6 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr,
     virSecurityLabelDefPtr seclabel;
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
 
-    if (mgr == NULL) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("invalid security driver"));
-        return rc;
-    }
-
     seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
     if (seclabel == NULL) {
         return rc;
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index a61e0f0..a042b26 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -560,12 +560,6 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
     virSecuritySELinuxDataPtr data;
     const char *baselabel;
 
-    if (mgr == NULL) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("invalid security driver"));
-        return rc;
-    }
-
     seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME);
     if (seclabel == NULL) {
         return rc;
-- 
1.7.11.7

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list