From 81f644ddff540fd9640eb38d7454f83ec03eeff5 Mon Sep 17 00:00:00 2001 From: Nicolas Lacasse Date: Fri, 21 Apr 2023 14:29:08 -0700 Subject: [PATCH] Enable socket_stress_test with hostinet. The min/max port ranges were broken. PiperOrigin-RevId: 526137330 --- pkg/sentry/inet/test_stack.go | 2 +- pkg/sentry/socket/hostinet/stack.go | 2 +- test/syscalls/BUILD | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/sentry/inet/test_stack.go b/pkg/sentry/inet/test_stack.go index 9e29f76a8..950576a58 100644 --- a/pkg/sentry/inet/test_stack.go +++ b/pkg/sentry/inet/test_stack.go @@ -177,7 +177,7 @@ func (s *TestStack) SetForwarding(protocol tcpip.NetworkProtocolNumber, enable b // PortRange implements Stack. func (*TestStack) PortRange() (uint16, uint16) { // Use the default Linux values per net/ipv4/af_inet.c:inet_init_net(). - return 32768, 28232 + return 32768, 60999 } // SetPortRange implements Stack. diff --git a/pkg/sentry/socket/hostinet/stack.go b/pkg/sentry/socket/hostinet/stack.go index 01dc802ed..7b7220713 100644 --- a/pkg/sentry/socket/hostinet/stack.go +++ b/pkg/sentry/socket/hostinet/stack.go @@ -346,7 +346,7 @@ func (*Stack) SetForwarding(tcpip.NetworkProtocolNumber, bool) error { // PortRange implements inet.Stack.PortRange. func (*Stack) PortRange() (uint16, uint16) { // Use the default Linux values per net/ipv4/af_inet.c:inet_init_net(). - return 32768, 28232 + return 32768, 60999 } // SetPortRange implements inet.Stack.SetPortRange. diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD index 2e048e04d..4f96ade93 100644 --- a/test/syscalls/BUILD +++ b/test/syscalls/BUILD @@ -928,6 +928,7 @@ syscall_test( syscall_test( size = "large", + add_hostinet = True, shard_count = most_shards, test = "//test/syscalls/linux:socket_stress_test", )