upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 22:32:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sockets/tcp: quick fix for regression with SO_REUSEPORT_LB

Browse source 
There was a long living problem that pr_listen is called every time on
consecutive listen(2) syscalls.  Up until today it produces spurious TCP
state change events in tracing software and other harmless problems.  But
with 7cbb6b6e28 we started to call LIST_REMOVE() twice on the same
entry.

This is quite ugly, but quick and robust fix against regression, that we
decided to put in the scope of the January stabilization week.  A better
refactoring will happen later.

Reviewed by:		markj
Differential Revision:	https://reviews.freebsd.org/D48703
Fixes:			7cbb6b6e28
This commit is contained in:
Gleb Smirnoff 2025-01-27 21:02:22 -08:00
parent aa90fbed15
commit 06bf119f26
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/netinet/tcp_usrreq.c
View file

@ -355,9 +355,10 @@ out:
static int
tcp_usr_listen(struct socket *so, int backlog, struct thread *td)
{
int error = 0;
struct inpcb *inp;
struct tcpcb *tp;
int error = 0;
bool already_listening;
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("tcp_usr_listen: inp == NULL"));
@ -369,6 +370,7 @@ tcp_usr_listen(struct socket *so, int backlog, struct thread *td)
tp = intotcpcb(inp);
SOCK_LOCK(so);
already_listening = SOLISTENING(so);
error = solisten_proto_check(so);
if (error != 0) {
SOCK_UNLOCK(so);
@ -390,6 +392,8 @@ tcp_usr_listen(struct socket *so, int backlog, struct thread *td)
solisten_proto_abort(so);
}
SOCK_UNLOCK(so);
if (already_listening)
goto out;
if (error == 0)
in_pcblisten(inp);
@ -408,10 +412,11 @@ out:
static int
tcp6_usr_listen(struct socket *so, int backlog, struct thread *td)
{
int error = 0;
struct inpcb *inp;
struct tcpcb *tp;
u_char vflagsav;
int error = 0;
bool already_listening;
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("tcp6_usr_listen: inp == NULL"));
@ -425,6 +430,7 @@ tcp6_usr_listen(struct socket *so, int backlog, struct thread *td)
vflagsav = inp->inp_vflag;
SOCK_LOCK(so);
already_listening = SOLISTENING(so);
error = solisten_proto_check(so);
if (error != 0) {
SOCK_UNLOCK(so);
@ -449,6 +455,8 @@ tcp6_usr_listen(struct socket *so, int backlog, struct thread *td)
solisten_proto_abort(so);
}
SOCK_UNLOCK(so);
if (already_listening)
goto out;
if (error == 0)
in_pcblisten(inp);