summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/vfs
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-01 22:40:53 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-01 22:40:53 +0000
commit36d32739e7aa4352075a3b54c7a220f78c49674b (patch)
tree20a62b81adf00fe9787e385f3a2d1f94d72b9c38 /pkg/sentry/vfs
parent90c84c8bac49c2b8c92e099dfc0e4fe7a8f36b4e (diff)
parentd7d8a0a5aee841dd7958b0e6bc3b544016d19c24 (diff)
Merge release-20210518.0-65-gd7d8a0a5a (automated)
Diffstat (limited to 'pkg/sentry/vfs')
-rw-r--r--pkg/sentry/vfs/mount.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/vfs/mount.go b/pkg/sentry/vfs/mount.go
index 82fd382c2..f93da3af1 100644
--- a/pkg/sentry/vfs/mount.go
+++ b/pkg/sentry/vfs/mount.go
@@ -220,7 +220,7 @@ func (vfs *VirtualFilesystem) ConnectMountAt(ctx context.Context, creds *auth.Cr
vdDentry := vd.dentry
vdDentry.mu.Lock()
for {
- if vdDentry.dead {
+ if vd.mount.umounted || vdDentry.dead {
vdDentry.mu.Unlock()
vfs.mountMu.Unlock()
vd.DecRef(ctx)