summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/netstack
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2020-01-08 20:05:02 -0800
committerKevin Krakauer <krakauer@google.com>2020-01-08 20:05:02 -0800
commit06e2366e964e41ade24a699b6fd650512270b975 (patch)
tree7a8a1f9427caedb725ae6804c7c69cb9d606c519 /pkg/sentry/socket/netstack
parent0999ae8b34d83a4b2ea8342d0459c8131c35d6e1 (diff)
parentae060a63d9ad1bfb65b84a2ccbaf2893c5a50b76 (diff)
Merge branch 'iptables-write' into iptables-write-input-drop
Diffstat (limited to 'pkg/sentry/socket/netstack')
-rw-r--r--pkg/sentry/socket/netstack/netstack.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go
index 86a8104df..85d5b7424 100644
--- a/pkg/sentry/socket/netstack/netstack.go
+++ b/pkg/sentry/socket/netstack/netstack.go
@@ -1376,10 +1376,7 @@ func (s *SocketOperations) SetSockOpt(t *kernel.Task, level int, name int, optVa
return syserr.ErrNoDevice
}
// Stack must be a netstack stack.
- if err := netfilter.SetEntries(stack.(*Stack).Stack, optVal); err != nil {
- return err
- }
- return nil
+ return netfilter.SetEntries(stack.(*Stack).Stack, optVal)
case linux.IPT_SO_SET_ADD_COUNTERS:
// TODO(gvisor.dev/issue/170): Counter support.