summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/uipc_socket.c56
-rw-r--r--sys/kern/uipc_usrreq.c23
-rw-r--r--sys/netatm/atm_cm.c14
-rw-r--r--sys/netatm/atm_socket.c2
-rw-r--r--sys/netatm/atm_var.h4
-rw-r--r--sys/netatm/ipatm/ipatm_load.c4
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c27
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c44
-rw-r--r--sys/netinet/tcp_usrreq.c18
-rw-r--r--sys/netipx/spx_usrreq.c9
-rw-r--r--sys/sys/socketvar.h2
11 files changed, 143 insertions, 60 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 8e34acdb9502..fbf0d5330b5a 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2004 The FreeBSD Foundation
- * Copyright (c) 2004-2005 Robert Watson
+ * Copyright (c) 2004-2005 Robert N. M. Watson
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -271,6 +271,18 @@ sodealloc(struct socket *so)
mtx_unlock(&so_global_mtx);
}
+/*
+ * solisten() transitions a socket from a non-listening state to a listening
+ * state, but can also be used to update the listen queue depth on an
+ * existing listen socket. The protocol will call back into the sockets
+ * layer using solisten_proto_check() and solisten_proto() to check and set
+ * socket-layer listen state. Call backs are used so that the protocol can
+ * acquire both protocol and socket layer locks in whatever order is reuiqred
+ * by the protocol.
+ *
+ * Protocol implementors are advised to hold the socket lock across the
+ * socket-layer test and set to avoid races at the socket layer.
+ */
int
solisten(so, backlog, td)
struct socket *so;
@@ -279,28 +291,44 @@ solisten(so, backlog, td)
{
int error;
- /*
- * XXXRW: Ordering issue here -- perhaps we need to set
- * SO_ACCEPTCONN before the call to pru_listen()?
- * XXXRW: General atomic test-and-set concerns here also.
- */
- if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
- SS_ISDISCONNECTING))
- return (EINVAL);
error = (*so->so_proto->pr_usrreqs->pru_listen)(so, td);
if (error)
return (error);
- ACCEPT_LOCK();
- SOCK_LOCK(so);
- so->so_options |= SO_ACCEPTCONN;
- SOCK_UNLOCK(so);
+
+ /*
+ * XXXRW: The following state adjustment should occur in
+ * solisten_proto(), but we don't currently pass the backlog request
+ * to the protocol via pru_listen().
+ */
if (backlog < 0 || backlog > somaxconn)
backlog = somaxconn;
so->so_qlimit = backlog;
- ACCEPT_UNLOCK();
return (0);
}
+int
+solisten_proto_check(so)
+ struct socket *so;
+{
+
+ SOCK_LOCK_ASSERT(so);
+
+ if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
+ SS_ISDISCONNECTING))
+ return (EINVAL);
+ return (0);
+}
+
+void
+solisten_proto(so)
+ struct socket *so;
+{
+
+ SOCK_LOCK_ASSERT(so);
+
+ so->so_options |= SO_ACCEPTCONN;
+}
+
/*
* Attempt to free a socket. This should really be sotryfree().
*
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index ba7e13b5d1a8..256c4fb5272a 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -124,7 +124,7 @@ static void unp_mark(struct file *);
static void unp_discard(struct file *);
static void unp_freerights(struct file **, int);
static int unp_internalize(struct mbuf **, struct thread *);
-static int unp_listen(struct unpcb *, struct thread *);
+static int unp_listen(struct socket *, struct unpcb *, struct thread *);
static int
uipc_abort(struct socket *so)
@@ -284,7 +284,7 @@ uipc_listen(struct socket *so, struct thread *td)
UNP_UNLOCK();
return (EINVAL);
}
- error = unp_listen(unp, td);
+ error = unp_listen(so, unp, td);
UNP_UNLOCK();
return (error);
}
@@ -1708,16 +1708,21 @@ unp_dispose(struct mbuf *m)
}
static int
-unp_listen(struct unpcb *unp, struct thread *td)
+unp_listen(struct socket *so, struct unpcb *unp, struct thread *td)
{
+ int error;
+
UNP_LOCK_ASSERT();
- /*
- * XXXRW: Why populate the local peer cred with our own credential?
- */
- cru2x(td->td_ucred, &unp->unp_peercred);
- unp->unp_flags |= UNP_HAVEPCCACHED;
- return (0);
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error == 0) {
+ cru2x(td->td_ucred, &unp->unp_peercred);
+ unp->unp_flags |= UNP_HAVEPCCACHED;
+ solisten_proto(so);
+ }
+ SOCK_UNLOCK(so);
+ return (error);
}
static void
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 2da05b387004..60bf48234da5 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -524,6 +524,7 @@ done:
* atm_cm_release().
*
* Arguments:
+ * so optional socket pointer -- if present, will set listen state
* epp pointer to endpoint definition structure
* token endpoint's listen instance token
* ap pointer to listening connection attributes
@@ -535,7 +536,8 @@ done:
*
*/
int
-atm_cm_listen(epp, token, ap, copp)
+atm_cm_listen(so, epp, token, ap, copp)
+ struct socket *so;
Atm_endpoint *epp;
void *token;
Atm_attributes *ap;
@@ -718,7 +720,13 @@ atm_cm_listen(epp, token, ap, copp)
/*
* Now try to register the listening connection
*/
+ if (so != NULL)
+ SOCK_LOCK(so);
s = splnet();
+ if (so != NULL)
+ err = solisten_proto_check(so);
+ if (err)
+ goto donex;
if (atm_cm_match(cop->co_lattr, NULL) != NULL) {
/*
* Can't have matching listeners
@@ -728,9 +736,13 @@ atm_cm_listen(epp, token, ap, copp)
}
cop->co_state = COS_LISTEN;
LINK2TAIL(cop, Atm_connection, atm_listen_queue, co_next);
+ if (so != NULL)
+ solisten_proto(so);
donex:
(void) splx(s);
+ if (so != NULL)
+ SOCK_UNLOCK(so);
done:
if (err) {
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index a851537095be..37ea86dfd860 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -350,7 +350,7 @@ atm_sock_listen(so, epp)
/*
* Start listening for incoming calls
*/
- return (atm_cm_listen(epp, atp, &atp->atp_attr, &atp->atp_conn));
+ return (atm_cm_listen(so, epp, atp, &atp->atp_attr, &atp->atp_conn));
}
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index e014bf61ab52..3332c927b134 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -81,8 +81,8 @@ void atm_aal5_init(void);
/* atm_cm.c */
int atm_cm_connect(Atm_endpoint *, void *, Atm_attributes *,
Atm_connection **);
-int atm_cm_listen(Atm_endpoint *, void *, Atm_attributes *,
- Atm_connection **);
+int atm_cm_listen(struct socket *, Atm_endpoint *, void *,
+ Atm_attributes *, Atm_connection **);
int atm_cm_addllc(Atm_endpoint *, void *, struct attr_llc *,
Atm_connection *, Atm_connection **);
int atm_cm_addparty(Atm_connection *, int, struct t_atm_sap *);
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 3df5e8fd4517..638c0ce7a3d9 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -522,8 +522,8 @@ ipatm_start()
/*
* Now start listening
*/
- if ((err = atm_cm_listen(&ipatm_endpt, (void *)(intptr_t)i,
- &ipatm_listeners[i].attr,
+ if ((err = atm_cm_listen(NULL, &ipatm_endpt,
+ (void *)(intptr_t)i, &ipatm_listeners[i].attr,
&ipatm_listeners[i].conn)) != 0)
goto done;
}
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 5662d1dcc8c4..1a25fb38db52 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -2409,13 +2409,28 @@ int
ng_btsocket_l2cap_listen(struct socket *so, struct thread *td)
{
ng_btsocket_l2cap_pcb_p pcb = so2l2cap_pcb(so);
+ int error;
- if (pcb == NULL)
- return (EINVAL);
- if (ng_btsocket_l2cap_node == NULL)
- return (EINVAL);
-
- return ((pcb->psm == 0)? EDESTADDRREQ : 0);
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error != 0)
+ goto out;
+ if (pcb == NULL) {
+ error = EINVAL;
+ goto out;
+ }
+ if (ng_btsocket_l2cap_node == NULL) {
+ error = EINVAL;
+ goto out;
+ }
+ if (pcb->psm == 0) {
+ error = EDESTADDRREQ;
+ goto out;
+ }
+ solisten_proto(so);
+out:
+ SOCK_UNLOCK(so);
+ return (error);
} /* ng_btsocket_listen */
/*
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 19a8dd668ce2..23f72fab6c36 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -800,6 +800,7 @@ ng_btsocket_rfcomm_listen(struct socket *so, struct thread *td)
ng_btsocket_rfcomm_session_p s = NULL;
struct socket *l2so = NULL;
int error;
+ int socreate_error;
if (pcb == NULL)
return (EINVAL);
@@ -816,14 +817,18 @@ ng_btsocket_rfcomm_listen(struct socket *so, struct thread *td)
* session.
*/
- error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
+ socreate_error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
BLUETOOTH_PROTO_L2CAP, td->td_ucred, td);
- /*
- * Look for the session in LISTENING state. There can only be one.
+ /*
+ * Transition the socket and session into the LISTENING state. Check
+ * for collisions first, as there can only be one.
*/
-
mtx_lock(&ng_btsocket_rfcomm_sessions_mtx);
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error != 0)
+ goto out;
LIST_FOREACH(s, &ng_btsocket_rfcomm_sessions, next)
if (s->state == NG_BTSOCKET_RFCOMM_SESSION_LISTENING)
@@ -835,10 +840,9 @@ ng_btsocket_rfcomm_listen(struct socket *so, struct thread *td)
* L2CAP socket. If l2so == NULL then error has the error code
* from socreate()
*/
-
if (l2so == NULL) {
- mtx_unlock(&ng_btsocket_rfcomm_sessions_mtx);
- return (error);
+ error = socreate_error;
+ goto out;
}
/*
@@ -848,21 +852,23 @@ ng_btsocket_rfcomm_listen(struct socket *so, struct thread *td)
* XXX FIXME Note that currently there is no way to adjust MTU
* for the default session.
*/
-
error = ng_btsocket_rfcomm_session_create(&s, l2so,
NG_HCI_BDADDR_ANY, NULL, td);
- if (error != 0) {
- mtx_unlock(&ng_btsocket_rfcomm_sessions_mtx);
- soclose(l2so);
-
- return (error);
- }
- } else if (l2so != NULL)
- soclose(l2so); /* we don't need new L2CAP socket */
-
+ if (error != 0)
+ goto out;
+ l2so = NULL;
+ }
+ solisten_proto(so);
+out:
+ SOCK_UNLOCK(so);
mtx_unlock(&ng_btsocket_rfcomm_sessions_mtx);
-
- return (0);
+ /*
+ * If we still have an l2so reference here, it's unneeded, so release
+ * it.
+ */
+ if (l2so != NULL)
+ soclose(l2so);
+ return (error);
} /* ng_btsocket_listen */
/*
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index d6824dd9151a..e5ddf5885a66 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -302,10 +302,15 @@ tcp_usr_listen(struct socket *so, struct thread *td)
const int inirw = INI_WRITE;
COMMON_START();
- if (inp->inp_lport == 0)
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error == 0 && inp->inp_lport == 0)
error = in_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
- if (error == 0)
+ if (error == 0) {
tp->t_state = TCPS_LISTEN;
+ solisten_proto(so);
+ }
+ SOCK_UNLOCK(so);
COMMON_END(PRU_LISTEN);
}
@@ -319,14 +324,19 @@ tcp6_usr_listen(struct socket *so, struct thread *td)
const int inirw = INI_WRITE;
COMMON_START();
- if (inp->inp_lport == 0) {
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error == 0 && inp->inp_lport == 0) {
inp->inp_vflag &= ~INP_IPV4;
if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0)
inp->inp_vflag |= INP_IPV4;
error = in6_pcbbind(inp, (struct sockaddr *)0, td->td_ucred);
}
- if (error == 0)
+ if (error == 0) {
tp->t_state = TCPS_LISTEN;
+ solisten_proto(so);
+ }
+ SOCK_UNLOCK(so);
COMMON_END(PRU_LISTEN);
}
#endif /* INET6 */
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 65901f2416f1..25042e62f453 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -1532,10 +1532,15 @@ spx_listen(so, td)
IPX_LIST_LOCK();
IPX_LOCK(ipxp);
- if (ipxp->ipxp_lport == 0)
+ SOCK_LOCK(so);
+ error = solisten_proto_check(so);
+ if (error == 0 && ipxp->ipxp_lport == 0)
error = ipx_pcbbind(ipxp, NULL, td);
- if (error == 0)
+ if (error == 0) {
cb->s_state = TCPS_LISTEN;
+ solisten_proto(so);
+ }
+ SOCK_UNLOCK(so);
IPX_UNLOCK(ipxp);
IPX_LIST_UNLOCK();
return (error);
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 9ac3dfe41f13..415a6c257c9e 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -513,6 +513,8 @@ void soisconnecting(struct socket *so);
void soisdisconnected(struct socket *so);
void soisdisconnecting(struct socket *so);
int solisten(struct socket *so, int backlog, struct thread *td);
+void solisten_proto(struct socket *so);
+int solisten_proto_check(struct socket *so);
struct socket *
sonewconn(struct socket *head, int connstatus);
int sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 07:23:27 +0000