diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-20 00:52:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-20 00:52:28 +0000 |
| commit | 85fb1397851dc95961e4fedea8f9cd9f4af9e648 (patch) | |
| tree | 81e652b96c84f2558c08c1a8495843ba86f85c4a /pkg/sentry/kernel | |
| parent | 8875e38909ee1042c59b91c3e3d785490e3a84a6 (diff) | |
| parent | cd86bd493156f055aa09a5c23f33a8a432cb8d00 (diff) | |
Merge release-20201005.0-104-gcd86bd493 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/pipe/vfs.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/pipe/vfs.go b/pkg/sentry/kernel/pipe/vfs.go index f61039f5b..1a152142b 100644 --- a/pkg/sentry/kernel/pipe/vfs.go +++ b/pkg/sentry/kernel/pipe/vfs.go @@ -237,8 +237,7 @@ func (fd *VFSPipeFD) Ioctl(ctx context.Context, uio usermem.IO, args arch.Syscal // PipeSize implements fcntl(F_GETPIPE_SZ). func (fd *VFSPipeFD) PipeSize() int64 { - // Inline Pipe.FifoSize() rather than calling it with nil Context and - // fs.File and ignoring the returned error (which is always nil). + // Inline Pipe.FifoSize() since we don't have a fs.File. fd.pipe.mu.Lock() defer fd.pipe.mu.Unlock() return fd.pipe.max |