diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2026-04-12 18:33:41 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2026-04-12 18:33:41 +0000 |
| commit | d7c409174d25f925c1e93f54957cdadb4545da3a (patch) | |
| tree | de64d13451490332b33695f14c6ca0c1e58bb09e | |
| parent | 2c48736c55c2154327f7e9219d4d69224181ab72 (diff) | |
inpcb: make in6_pcbsetport() acquire the hash lock internally
Reviewed by: pouria, rrs, markj
Differential Revision: https://reviews.freebsd.org/D55972
| -rw-r--r-- | sys/netinet6/in6_pcb.c | 25 | ||||
| -rw-r--r-- | sys/netinet6/udp6_usrreq.c | 5 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 05ca68d014ff..136f5c8a9828 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -112,18 +112,16 @@ #include <netinet6/in6_fib.h> #include <netinet6/scope6_var.h> -int -in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) +static int +in6_pcbsetport_locked(struct in6_addr *laddr, struct inpcb *inp, + struct ucred *cred) { struct socket *so = inp->inp_socket; u_int16_t lport = 0; int error, lookupflags = 0; -#ifdef INVARIANTS - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; -#endif INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); + INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); error = prison_local_ip6(cred, laddr, ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0)); @@ -150,6 +148,18 @@ in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) return (0); } +int +in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) +{ + int error; + + INP_HASH_WLOCK(inp->inp_pcbinfo); + error = in6_pcbsetport_locked(laddr, inp, cred); + INP_HASH_WUNLOCK(inp->inp_pcbinfo); + + return (error); +} + /* * Determine whether the inpcb can be bound to the specified address/port tuple. */ @@ -341,7 +351,8 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, int flags, if ((flags & INPBIND_FIB) != 0) inp->inp_flags |= INP_BOUNDFIB; if (lport == 0) { - if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0) { + error = in6_pcbsetport_locked(&inp->in6p_laddr, inp, cred); + if (__predict_false(error != 0)) { INP_HASH_WUNLOCK(inp->inp_pcbinfo); /* Undo an address bind that may have occurred. */ inp->inp_flags &= ~INP_BOUNDFIB; diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 98d9d52d2a61..3f4c3111fa5b 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -832,14 +832,9 @@ udp6_send(struct socket *so, int flags_arg, struct mbuf *m, laddr = &in6a; if (inp->inp_lport == 0) { - struct inpcbinfo *pcbinfo; - INP_WLOCK_ASSERT(inp); - pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol); - INP_HASH_WLOCK(pcbinfo); error = in6_pcbsetport(laddr, inp, td->td_ucred); - INP_HASH_WUNLOCK(pcbinfo); if (error != 0) { /* Undo an address bind that may have occurred. */ inp->in6p_laddr = in6addr_any; |