diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-24 18:49:57 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-24 18:49:57 +0000 |
| commit | ada068d683c1f6be72ecbeda436659ba6ecd1e9a (patch) | |
| tree | a23dd4061907427c2d1e289a45651dc6b102e44f /pkg/sentry/fsimpl/proc/tasks.go | |
| parent | 57f05062f655eb7b1d9a43b407b82b97449195ee (diff) | |
| parent | 2cc0fd42f462f3942230c4b33ca2825e2a28765d (diff) | |
Merge release-20200323.0-235-g2cc0fd4 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/proc/tasks.go')
| -rwxr-xr-x | pkg/sentry/fsimpl/proc/tasks.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/proc/tasks.go b/pkg/sentry/fsimpl/proc/tasks.go index 9f2ef8200..26518ed03 100755 --- a/pkg/sentry/fsimpl/proc/tasks.go +++ b/pkg/sentry/fsimpl/proc/tasks.go @@ -202,8 +202,10 @@ func (i *tasksInode) IterDirents(ctx context.Context, cb vfs.IterDirentsCallback // Open implements kernfs.Inode. func (i *tasksInode) Open(rp *vfs.ResolvingPath, vfsd *vfs.Dentry, opts vfs.OpenOptions) (*vfs.FileDescription, error) { - fd := &kernfs.GenericDirectoryFD{} - fd.Init(rp.Mount(), vfsd, &i.OrderedChildren, &opts) + fd, err := kernfs.NewGenericDirectoryFD(rp.Mount(), vfsd, &i.OrderedChildren, &opts) + if err != nil { + return nil, err + } return fd.VFSFileDescription(), nil } |