diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 07:17:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 07:17:12 +0000 |
| commit | 8959c30e99cd49d9f512ebeea65e7d45a776c242 (patch) | |
| tree | 420a25ac563ffaeb53ae3719bc9afe450bedc040 /pkg/sentry/kernel | |
| parent | a9df0a1cd8fd0b88203d4700bb78b803cc9ec1f2 (diff) | |
| parent | fc7df53222e56fdce7dee002f1fb4c332de616af (diff) | |
Merge release-20200928.0-98-gfc7df5322 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/kernel.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go index 16c427fc8..d635c9e73 100644 --- a/pkg/sentry/kernel/kernel.go +++ b/pkg/sentry/kernel/kernel.go @@ -1744,12 +1744,14 @@ func (k *Kernel) SocketMount() *vfs.Mount { // Precondition: This should only be called after the kernel is fully // initialized, e.g. after k.Start() has been called. func (k *Kernel) Release() { + ctx := k.SupervisorContext() if VFS2Enabled { - ctx := k.SupervisorContext() k.hostMount.DecRef(ctx) k.pipeMount.DecRef(ctx) k.shmMount.DecRef(ctx) k.socketMount.DecRef(ctx) k.vfs.Release(ctx) } + k.timekeeper.Destroy() + k.vdso.Release(ctx) } |