From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 13 Jan 2020 11:50:41 +0000 (+0100)
Subject: vircgroupv2devices: free BPF map when replacing with new one
X-Git-Tag: v6.0.0-rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d608469621a3fda72dff2a89308e68cc9fb4c9a;p=thirdparty%2Flibvirt.git

vircgroupv2devices: free BPF map when replacing with new one

This leaks the FD of BPF map which means it will not be freed.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c
index 402ce3f86f..445f9c53fc 100644
--- a/src/util/vircgroupv2devices.c
+++ b/src/util/vircgroupv2devices.c
@@ -311,6 +311,11 @@ virCgroupV2DevicesAttachProg(virCgroupPtr group,
         VIR_FORCE_CLOSE(group->unified.devices.progfd);
     }
 
+    if (group->unified.devices.mapfd > 0) {
+        VIR_DEBUG("Closing existing map that was replaced by new one.");
+        VIR_FORCE_CLOSE(group->unified.devices.mapfd);
+    }
+
     group->unified.devices.progfd = progfd;
     group->unified.devices.mapfd = mapfd;
     group->unified.devices.max = max;