|
 |
ab145e |
From 8ad6e3bc6d3e9e55093b546ee886a2a2d9e875f5 Mon Sep 17 00:00:00 2001
|
|
|
ab145e |
Message-Id: <8ad6e3bc6d3e9e55093b546ee886a2a2d9e875f5@dist-git>
|
|
|
ab145e |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ab145e |
Date: Fri, 21 May 2021 14:16:13 +0200
|
|
|
ab145e |
Subject: [PATCH] domain_conf: Don't leak def->os.firmwareFeatures
|
|
|
ab145e |
|
|
|
ab145e |
The firmwareFeatures member of virDomainOSDef struct is allocated
|
|
|
ab145e |
in virDomainDefParseBootFirmwareOptions() but never freed.
|
|
|
ab145e |
|
|
|
ab145e |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ab145e |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
ab145e |
(cherry picked from commit c116b9481426f86188c71f340d5e3db103120bf8)
|
|
|
ab145e |
|
|
|
ab145e |
Conflicts:
|
|
|
ab145e |
src/conf/domain_conf.c
|
|
|
ab145e |
- missing upstream commits:
|
|
|
ab145e |
77f8e48fc35eaf867eae4f623e381f87f6e29930
|
|
|
ab145e |
f9f81f1c8f855b8c21aeae4441abfc877ff2bfc3
|
|
|
ab145e |
|
|
|
ab145e |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1929357
|
|
|
ab145e |
|
|
|
ab145e |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
ab145e |
Message-Id: <82f4beea71e682c43ec10370d5a43a608d1cb411.1621599207.git.phrdina@redhat.com>
|
|
|
ab145e |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ab145e |
---
|
|
|
ab145e |
src/conf/domain_conf.c | 1 +
|
|
|
ab145e |
1 file changed, 1 insertion(+)
|
|
|
ab145e |
|
|
|
ab145e |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
ab145e |
index 28c8d0ecbd..2ffa9c8a2a 100644
|
|
|
ab145e |
--- a/src/conf/domain_conf.c
|
|
|
ab145e |
+++ b/src/conf/domain_conf.c
|
|
|
ab145e |
@@ -3431,6 +3431,7 @@ void virDomainDefFree(virDomainDefPtr def)
|
|
|
ab145e |
VIR_FREE(def->idmap.uidmap);
|
|
|
ab145e |
VIR_FREE(def->idmap.gidmap);
|
|
|
ab145e |
|
|
|
ab145e |
+ VIR_FREE(def->os.firmwareFeatures);
|
|
|
ab145e |
VIR_FREE(def->os.machine);
|
|
|
ab145e |
VIR_FREE(def->os.init);
|
|
|
ab145e |
for (i = 0; def->os.initargv && def->os.initargv[i]; i++)
|
|
|
ab145e |
--
|
|
|
ab145e |
2.31.1
|
|
|
ab145e |
|