From: John Ferlan <jferlan@redhat.com>
Date: Fri, 13 Feb 2015 19:15:26 +0000 (-0500)
Subject: security: Resolve Coverity RESOURCE_LEAK
X-Git-Tag: v1.2.13-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a36cdbccee67f8f7c56daeb758ecbbba2dea6b1;p=thirdparty%2Flibvirt.git

security: Resolve Coverity RESOURCE_LEAK

Introduced by commit id 'c3d9d3bb' - return from virSecurityManagerCheckModel
wasn't VIR_FREE()'ing the virSecurityManagerGetNested allocated memory.
---

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index f2a32bc1fa..b0cd9e8569 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -688,24 +688,29 @@ virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr,
 static int virSecurityManagerCheckModel(virSecurityManagerPtr mgr,
                                         char *secmodel)
 {
+    int ret = -1;
     size_t i;
     virSecurityManagerPtr *sec_managers = NULL;
 
-    if ((sec_managers = virSecurityManagerGetNested(mgr)) == NULL)
-        return -1;
-
     if (STREQ_NULLABLE(secmodel, "none"))
         return 0;
 
+    if ((sec_managers = virSecurityManagerGetNested(mgr)) == NULL)
+        return -1;
+
     for (i = 0; sec_managers[i]; i++) {
-        if (STREQ_NULLABLE(secmodel, sec_managers[i]->drv->name))
-            return 0;
+        if (STREQ_NULLABLE(secmodel, sec_managers[i]->drv->name)) {
+            ret = 0;
+            goto cleanup;
+        }
     }
 
     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                    _("Unable to find security driver for model %s"),
                    secmodel);
-    return -1;
+ cleanup:
+    VIR_FREE(sec_managers);
+    return ret;
 }