Page MenuHomeFreeBSD
Files F144361875

D49150.id151560.diff
No OneTemporary
Actions

D49150.id151560.diff
View Options

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1184,6 +1184,7 @@
else
lport = inp->inp_lport;
+ inp->inp_socket->so_options &= ~SO_REUSEPORT_LB;
inp->inp_faddr = faddr;
inp->inp_fport = sin->sin_port;
diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c
--- a/tests/sys/netinet/so_reuseport_lb_test.c
+++ b/tests/sys/netinet/so_reuseport_lb_test.c
@@ -478,6 +478,43 @@
ATF_REQUIRE_MSG(error == 0, "close() failed: %s", strerror(errno));
}
+/*
+ * Check that SO_REUSEPORT_LB doesn't mess with connect(2).
+ * Three sockets:
+ * 1) auxiliary peer socket 'p', where we connect to
+ * 2) test socket 's', that sets SO_REUSEPORT_LB and then connect(2)s to 'p'
+ * 3) legitimate SO_REUSEPORT_LB listener 'l' that lands on the same group
+ * as 's'
+ */
+ATF_TC_WITHOUT_HEAD(connect);
+ATF_TC_BODY(connect, tc)
+{
+ struct sockaddr_in sin = {
+ .sin_family = AF_INET,
+ .sin_len = sizeof(sin),
+ .sin_addr = { htonl(INADDR_LOOPBACK) },
+ };
+ socklen_t slen = sizeof(struct sockaddr_in);
+ int p, s, l;
+
+ ATF_REQUIRE((p = socket(PF_INET, SOCK_STREAM, 0)) > 0);
+ ATF_REQUIRE(bind(p, (struct sockaddr *)&sin, sizeof(sin)) == 0);
+ ATF_REQUIRE(listen(p, 1) == 0);
+ ATF_REQUIRE(getsockname(p, (struct sockaddr *)&sin, &slen) == 0);
+
+ s = lb_listen_socket(PF_INET, 0);
+ ATF_REQUIRE(connect(s, (struct sockaddr *)&sin, sizeof(sin)) == 0);
+ ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin, &slen) == 0);
+
+ l = lb_listen_socket(PF_INET, 0);
+ ATF_REQUIRE(bind(l, (struct sockaddr *)&sin, sizeof(sin)) == 0);
+ ATF_REQUIRE(listen(l, 1) == 0);
+
+ close(p);
+ close(s);
+ close(l);
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, basic_ipv4);
@@ -486,6 +523,7 @@
ATF_TP_ADD_TC(tp, double_listen_ipv4);
ATF_TP_ADD_TC(tp, double_listen_ipv6);
ATF_TP_ADD_TC(tp, bind_without_listen);
+ ATF_TP_ADD_TC(tp, connect);
return (atf_no_error());
}

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 1:26 AM (6 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28520810
Default Alt Text
D49150.id151560.diff (1 KB)

Event Timeline