diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-28 23:44:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-28 23:44:15 +0000 |
| commit | 5256e3e73cdf999448c930940be8f0b71cf0f8b1 (patch) | |
| tree | 65fe40339e619395fd7b331c0e642e5400cacfc1 /pkg/sentry/kernel/task_exec.go | |
| parent | 1afa1ac87c09bd2eea2c61877e2ad78baeee7a8f (diff) | |
| parent | 437c986c6a0ed0e1fccfbfb6706f43d2c801c444 (diff) | |
Merge release-20200115.0-125-g437c986 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_exec.go')
| -rw-r--r-- | pkg/sentry/kernel/task_exec.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_exec.go b/pkg/sentry/kernel/task_exec.go index fa6528386..8f57a34a6 100644 --- a/pkg/sentry/kernel/task_exec.go +++ b/pkg/sentry/kernel/task_exec.go @@ -69,6 +69,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/mm" + "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserror" ) @@ -198,7 +199,7 @@ func (r *runSyscallAfterExecStop) execute(t *Task) taskRunState { t.tg.pidns.owner.mu.Unlock() // Remove FDs with the CloseOnExec flag set. - t.fdTable.RemoveIf(func(file *fs.File, flags FDFlags) bool { + t.fdTable.RemoveIf(func(_ *fs.File, _ *vfs.FileDescription, flags FDFlags) bool { return flags.CloseOnExec }) |