diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-09-24 10:41:42 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-09-24 10:41:42 -0700 |
| commit | b510c9846446d7f423c0531ec661c4344f96c578 (patch) | |
| tree | 66b6053afcd4fa81c5361c853e63fc8dddf95044 /pkg/sentry/kernel/task_start.go | |
| parent | 12175748aba75c0b3be5b3981763c1a1f5e73763 (diff) | |
| parent | dcbbd67cacb646838174b5c2a6e7db4e6c212cd5 (diff) | |
Merge pull request #6647 from avagin:task-netns
PiperOrigin-RevId: 398763161
Diffstat (limited to 'pkg/sentry/kernel/task_start.go')
| -rw-r--r-- | pkg/sentry/kernel/task_start.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_start.go b/pkg/sentry/kernel/task_start.go index 217c6f531..4919dea7c 100644 --- a/pkg/sentry/kernel/task_start.go +++ b/pkg/sentry/kernel/task_start.go @@ -140,7 +140,6 @@ func (ts *TaskSet) newTask(cfg *TaskConfig) (*Task, error) { allowedCPUMask: cfg.AllowedCPUMask.Copy(), ioUsage: &usage.IO{}, niceness: cfg.Niceness, - netns: cfg.NetworkNamespace, utsns: cfg.UTSNamespace, ipcns: cfg.IPCNamespace, abstractSockets: cfg.AbstractSocketNamespace, @@ -152,6 +151,7 @@ func (ts *TaskSet) newTask(cfg *TaskConfig) (*Task, error) { containerID: cfg.ContainerID, cgroups: make(map[Cgroup]struct{}), } + t.netns.Store(cfg.NetworkNamespace) t.creds.Store(cfg.Credentials) t.endStopCond.L = &t.tg.signalHandlers.mu t.ptraceTracer.Store((*Task)(nil)) |