diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-19 20:39:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-19 20:39:15 +0000 |
| commit | 2e6b8ba1d4c6fe49dc3d638ec81bb2834b484c4a (patch) | |
| tree | 04e2685f6284d4e5b67597e1ec5fcd4d852eb152 /pkg/sentry/fsimpl/proc | |
| parent | ea9059bf2ab62096f540508539b21c6f3c1d6eb6 (diff) | |
| parent | 8655fb72482e179923987759f378543b2f489f08 (diff) | |
Merge release-20200608.0-97-g8655fb724 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/proc')
| -rw-r--r-- | pkg/sentry/fsimpl/proc/task_fds.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/proc/task_fds.go b/pkg/sentry/fsimpl/proc/task_fds.go index 7debdb07a..fea29e5f0 100644 --- a/pkg/sentry/fsimpl/proc/task_fds.go +++ b/pkg/sentry/fsimpl/proc/task_fds.go @@ -64,7 +64,7 @@ type fdDir struct { } // IterDirents implements kernfs.inodeDynamicLookup. -func (i *fdDir) IterDirents(ctx context.Context, cb vfs.IterDirentsCallback, absOffset, relOffset int64) (int64, error) { +func (i *fdDir) IterDirents(ctx context.Context, cb vfs.IterDirentsCallback, offset, relOffset int64) (int64, error) { var fds []int32 i.task.WithMuLocked(func(t *kernel.Task) { if fdTable := t.FDTable(); fdTable != nil { @@ -72,7 +72,6 @@ func (i *fdDir) IterDirents(ctx context.Context, cb vfs.IterDirentsCallback, abs } }) - offset := absOffset + relOffset typ := uint8(linux.DT_REG) if i.produceSymlink { typ = linux.DT_LNK |