|
 |
7548c0 |
From 7cdf83f2e699a9c9b8cafbc09dbd21d2cb3a3b45 Mon Sep 17 00:00:00 2001
|
|
|
7548c0 |
Message-Id: <7cdf83f2e699a9c9b8cafbc09dbd21d2cb3a3b45@dist-git>
|
|
|
7548c0 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7548c0 |
Date: Fri, 19 Feb 2021 13:34:01 +0100
|
|
|
7548c0 |
Subject: [PATCH] vircgroup: correctly free nested virCgroupPtr
|
|
|
7548c0 |
MIME-Version: 1.0
|
|
|
7548c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7548c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7548c0 |
|
|
|
7548c0 |
Fixes: 184245f53b94fc84f727eb6e8a2aa52df02d69c0
|
|
|
7548c0 |
|
|
|
7548c0 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
7548c0 |
(cherry picked from commit 6a1f5e8a4f3184bb54b9dcaa3afcf8c97adccb62)
|
|
|
7548c0 |
|
|
|
7548c0 |
Conflicts:
|
|
|
7548c0 |
src/util/vircgroup.c
|
|
|
7548c0 |
- missing upstream g_free rewrite
|
|
|
7548c0 |
|
|
|
7548c0 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463
|
|
|
7548c0 |
|
|
|
7548c0 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7548c0 |
Message-Id: <bc2f0207bc684ca81c45b6234a7aaba5227867d7.1613737828.git.phrdina@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
7548c0 |
---
|
|
|
7548c0 |
src/util/vircgroup.c | 3 ++-
|
|
|
7548c0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
7548c0 |
|
|
|
7548c0 |
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
|
7548c0 |
index d0f867ba7f..0a6404e97c 100644
|
|
|
7548c0 |
--- a/src/util/vircgroup.c
|
|
|
7548c0 |
+++ b/src/util/vircgroup.c
|
|
|
7548c0 |
@@ -3711,7 +3711,8 @@ virCgroupFree(virCgroupPtr *group)
|
|
|
7548c0 |
VIR_FREE((*group)->unified.mountPoint);
|
|
|
7548c0 |
VIR_FREE((*group)->unified.placement);
|
|
|
7548c0 |
VIR_FREE((*group)->unitName);
|
|
|
7548c0 |
- VIR_FREE((*group)->nested);
|
|
|
7548c0 |
+
|
|
|
7548c0 |
+ virCgroupFree(&(*group)->nested);
|
|
|
7548c0 |
|
|
|
7548c0 |
VIR_FREE((*group)->path);
|
|
|
7548c0 |
VIR_FREE(*group);
|
|
|
7548c0 |
--
|
|
|
7548c0 |
2.30.0
|
|
|
7548c0 |
|