summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-08-12 00:26:22 +0000
committergVisor bot <gvisor-bot@google.com>2021-08-12 00:26:22 +0000
commit3486648e75a831840219939f41ac89ef64dea0f3 (patch)
treea7afe5244eed1fdfc9d3ccb550bf526c45e35a83 /pkg/sentry/kernel
parentddd6507953d90452314553fedce6bbf7f372c635 (diff)
parenta50596874a4971167f97a05181363e91292a2885 (diff)
Merge release-20210726.0-50-ga50596874 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r--pkg/sentry/kernel/cgroup.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/cgroup.go b/pkg/sentry/kernel/cgroup.go
index c93ef6ac1..a0e291f58 100644
--- a/pkg/sentry/kernel/cgroup.go
+++ b/pkg/sentry/kernel/cgroup.go
@@ -196,6 +196,7 @@ func (r *CgroupRegistry) FindHierarchy(ctypes []CgroupControllerType) *vfs.Files
// uniqueness of controllers enforced by Register, drop the
// dying hierarchy now. The eventual unregister by the FS
// teardown will become a no-op.
+ r.unregisterLocked(h.id)
return nil
}
return h.fs