diff options
| author | nybidari <59618317+nybidari@users.noreply.github.com> | 2020-02-25 15:33:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 15:33:59 -0800 |
| commit | 818abc2bd5096bf7dc6f621cfd2923bee4e0fc7b (patch) | |
| tree | 0f7f90cecb6afc332a3229651eba4da391a46b41 /pkg/sentry/fsimpl/tmpfs/filesystem.go | |
| parent | acc405ba60834f5dce9ce04cd762d5cda02224cb (diff) | |
| parent | 72e3f3a3eef3a1dc02db0ff71f98a5d7fe89a6e3 (diff) | |
Merge branch 'master' into iptables
Diffstat (limited to 'pkg/sentry/fsimpl/tmpfs/filesystem.go')
| -rw-r--r-- | pkg/sentry/fsimpl/tmpfs/filesystem.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/sentry/fsimpl/tmpfs/filesystem.go b/pkg/sentry/fsimpl/tmpfs/filesystem.go index 7f7b791c4..e1b551422 100644 --- a/pkg/sentry/fsimpl/tmpfs/filesystem.go +++ b/pkg/sentry/fsimpl/tmpfs/filesystem.go @@ -16,7 +16,6 @@ package tmpfs import ( "fmt" - "sync/atomic" "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/context" @@ -347,10 +346,9 @@ func (d *dentry) open(ctx context.Context, rp *vfs.ResolvingPath, opts *vfs.Open return nil, err } if opts.Flags&linux.O_TRUNC != 0 { - impl.mu.Lock() - impl.data.Truncate(0, impl.memFile) - atomic.StoreUint64(&impl.size, 0) - impl.mu.Unlock() + if _, err := impl.truncate(0); err != nil { + return nil, err + } } return &fd.vfsfd, nil case *directory: |