diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-28 01:22:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-28 01:22:16 +0000 |
| commit | ddbbf54c9398dd8cf16b9533522c5649ed8bfb37 (patch) | |
| tree | ffb9a52199ca8a39cfbe28196ec2f467bfbd507a /pkg/sentry/fsimpl/tmpfs/filesystem.go | |
| parent | 68587b6e984c2ef3e0bc2c66af27a8201faef59e (diff) | |
| parent | 32021bce9607e09f3d21d3d28047d49340da231e (diff) | |
Merge release-20200518.0-48-g32021bce (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/tmpfs/filesystem.go')
| -rw-r--r-- | pkg/sentry/fsimpl/tmpfs/filesystem.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/tmpfs/filesystem.go b/pkg/sentry/fsimpl/tmpfs/filesystem.go index 80fa7b29d..7c04570f1 100644 --- a/pkg/sentry/fsimpl/tmpfs/filesystem.go +++ b/pkg/sentry/fsimpl/tmpfs/filesystem.go @@ -603,8 +603,10 @@ func (fs *filesystem) RmdirAt(ctx context.Context, rp *vfs.ResolvingPath) error return err } parentDir.removeChildLocked(child) - parentDir.inode.decLinksLocked() // from child's ".." + // Remove links for child, child/., and child/.. child.inode.decLinksLocked() + child.inode.decLinksLocked() + parentDir.inode.decLinksLocked() vfsObj.CommitDeleteDentry(&child.vfsd) parentDir.inode.touchCMtime() return nil |