mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
vircgroupv2: properly free BPF prog and map FDs
When nested cgroup was introduced it did not properly free file
descriptors for BPF prog and map. With nested cgroups we create the BPF
bits in the nested cgroup instead of the VM root cgroup.
This would leak the FDs which would be the last reference to the prog
and map so kernel would not remove the resources as well. It would only
happen once libvirtd process exits.
Fixes: 184245f53b
Reported-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
8674faaf32
commit
6960a895ab
@ -523,6 +523,7 @@ static int
|
||||
virCgroupV2Remove(virCgroup *group)
|
||||
{
|
||||
g_autofree char *grppath = NULL;
|
||||
virCgroup *parent = virCgroupGetNested(group);
|
||||
int controller;
|
||||
|
||||
/* Don't delete the root group, if we accidentally
|
||||
@ -534,7 +535,7 @@ virCgroupV2Remove(virCgroup *group)
|
||||
if (virCgroupV2PathOfController(group, controller, "", &grppath) < 0)
|
||||
return 0;
|
||||
|
||||
if (virCgroupV2DevicesRemoveProg(group) < 0)
|
||||
if (virCgroupV2DevicesRemoveProg(parent) < 0)
|
||||
return -1;
|
||||
|
||||
return virCgroupRemoveRecursively(grppath);
|
||||
|
Loading…
Reference in New Issue
Block a user