From 9831bda48172881b14f3c473b625ce5ddbd04300 Mon Sep 17 00:00:00 2001
Message-Id: <9831bda48172881b14f3c473b625ce5ddbd04300@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:06:08 +0200
Subject: [PATCH] vircgroup: Call virCgroupRemove inside virCgroupMakeGroup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes virCgroupEnableMissingControllers where virCgroupRemove
was not called in case virCgroupMakeGroup failed.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit b013bdfd797489e6c254917da299842fe051d058)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <09accbd84f3da1d7c6682357cf6c9a720631a247.1561993099.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/vircgroup.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 8646a4a479..dde9ed21a2 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1052,7 +1052,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
         }
 
         if (virCgroupPathOfController(group, i, "", &path) < 0)
-            return -1;
+            goto error;
 
         /* As of Feb 2011, clang can't see that the above function
          * call did not modify group. */
@@ -1076,7 +1076,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
                     virReportSystemError(errno,
                                          _("Failed to create controller %s for group"),
                                          virCgroupControllerTypeToString(i));
-                    return -1;
+                    goto error;
                 }
             }
             if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
@@ -1084,7 +1084,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
                  STREQ(group->controllers[i].mountPoint,
                        group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
                 if (virCgroupCpuSetInherit(parent, group) < 0)
-                    return -1;
+                    goto error;
             }
             /*
              * Note that virCgroupSetMemoryUseHierarchy should always be
@@ -1096,13 +1096,17 @@ virCgroupMakeGroup(virCgroupPtr parent,
                  STREQ(group->controllers[i].mountPoint,
                        group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
                 if (virCgroupSetMemoryUseHierarchy(group) < 0)
-                    return -1;
+                    goto error;
             }
         }
     }
 
     VIR_DEBUG("Done making controllers for group");
     return 0;
+
+ error:
+    virCgroupRemove(group);
+    return -1;
 }
 
 
@@ -1316,10 +1320,8 @@ virCgroupNewPartition(const char *path,
         if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0)
             goto cleanup;
 
-        if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) {
-            virCgroupRemove(*group);
+        if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0)
             goto cleanup;
-        }
     }
 
     ret = 0;
@@ -1389,7 +1391,6 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
      */
     if (virCgroupMakeGroup(partition, *group, create,
                            VIR_CGROUP_MEM_HIERACHY) < 0) {
-        virCgroupRemove(*group);
         virCgroupFree(group);
         return -1;
     }
@@ -1446,7 +1447,6 @@ virCgroupNewThread(virCgroupPtr domain,
         return -1;
 
     if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) {
-        virCgroupRemove(*group);
         virCgroupFree(group);
         return -1;
     }
-- 
2.22.0