]> xenbits.xensource.com Git - libvirt.git/commitdiff
security: Remove unnecessary checks for mgr == NULL
authorJohn Ferlan <jferlan@redhat.com>
Wed, 13 Feb 2013 13:11:39 +0000 (08:11 -0500)
committerJohn Ferlan <jferlan@redhat.com>
Sat, 16 Feb 2013 12:44:35 +0000 (07:44 -0500)
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
src/security/security_selinux.c

index b115bb0157cf99afe9216c152ee022a3e51c9dde..0b274b7b5a9eef9bdb52656c5e7689975092e2e3 100644 (file)
@@ -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;
index a61e0f0e3a018d610c7ff7e09bb6c7824f71c553..a042b26845faa2ffc6d600079e1dddff04678108 100644 (file)
@@ -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;