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_net.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_net.go')
-rw-r--r-- | pkg/sentry/kernel/task_net.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkg/sentry/kernel/task_net.go b/pkg/sentry/kernel/task_net.go index f7711232c..e31e2b2e8 100644 --- a/pkg/sentry/kernel/task_net.go +++ b/pkg/sentry/kernel/task_net.go @@ -20,9 +20,7 @@ import ( // IsNetworkNamespaced returns true if t is in a non-root network namespace. func (t *Task) IsNetworkNamespaced() bool { - t.mu.Lock() - defer t.mu.Unlock() - return !t.netns.IsRoot() + return !t.netns.Load().IsRoot() } // NetworkContext returns the network stack used by the task. NetworkContext @@ -31,14 +29,10 @@ func (t *Task) IsNetworkNamespaced() bool { // TODO(gvisor.dev/issue/1833): Migrate callers of this method to // NetworkNamespace(). func (t *Task) NetworkContext() inet.Stack { - t.mu.Lock() - defer t.mu.Unlock() - return t.netns.Stack() + return t.netns.Load().Stack() } // NetworkNamespace returns the network namespace observed by the task. func (t *Task) NetworkNamespace() *inet.Namespace { - t.mu.Lock() - defer t.mu.Unlock() - return t.netns + return t.netns.Load() } |