diff options
author | rwatson <rwatson@FreeBSD.org> | 2006-04-01 16:20:54 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2006-04-01 16:20:54 +0000 |
commit | a7c2bca553bef1485f864043c190482cc9c6fdd4 (patch) | |
tree | 60c6d1ae13c348075601004daade9dd8338f72a3 /sys/netinet6 | |
parent | 71cc03392bbc78f93765e5550fc35f98c373df04 (diff) | |
download | FreeBSD-src-a7c2bca553bef1485f864043c190482cc9c6fdd4.zip FreeBSD-src-a7c2bca553bef1485f864043c190482cc9c6fdd4.tar.gz |
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/raw_ip6.c | 35 | ||||
-rw-r--r-- | sys/netinet6/udp6_usrreq.c | 66 |
2 files changed, 31 insertions, 70 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 5b6daac..76fb495 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -549,27 +549,18 @@ rip6_attach(struct socket *so, int proto, struct thread *td) struct icmp6_filter *filter; int error, s; - INP_INFO_WLOCK(&ripcbinfo); inp = sotoinpcb(so); - if (inp) { - INP_INFO_WUNLOCK(&ripcbinfo); - panic("rip6_attach"); - } - if (td && (error = suser(td)) != 0) { - INP_INFO_WUNLOCK(&ripcbinfo); + KASSERT(inp == NULL, ("rip6_attach: inp != NULL")); + if (td && (error = suser(td)) != 0) return error; - } error = soreserve(so, rip_sendspace, rip_recvspace); - if (error) { - INP_INFO_WUNLOCK(&ripcbinfo); + if (error) return error; - } MALLOC(filter, struct icmp6_filter *, sizeof(struct icmp6_filter), M_PCB, M_NOWAIT); - if (filter == NULL) { - INP_INFO_WUNLOCK(&ripcbinfo); + if (filter == NULL) return ENOMEM; - } + INP_INFO_WLOCK(&ripcbinfo); s = splnet(); error = in_pcballoc(so, &ripcbinfo, "raw6inp"); splx(s); @@ -596,12 +587,8 @@ rip6_detach(struct socket *so) { struct inpcb *inp; - INP_INFO_WLOCK(&ripcbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&ripcbinfo); - panic("rip6_detach"); - } + KASSERT(inp != NULL, ("rip6_detach: inp == NULL")); /* xxx: RSVP */ if (so == ip6_mrouter) ip6_mrouter_done(); @@ -609,8 +596,10 @@ rip6_detach(struct socket *so) FREE(inp->in6p_icmp6filt, M_PCB); inp->in6p_icmp6filt = NULL; } + INP_INFO_WLOCK(&ripcbinfo); INP_LOCK(inp); in6_pcbdetach(inp); + in6_pcbfree(inp); INP_INFO_WUNLOCK(&ripcbinfo); } @@ -630,7 +619,7 @@ rip6_disconnect(struct socket *so) return ENOTCONN; inp->in6p_faddr = in6addr_any; rip6_abort(so); - return 0; + return (0); } static int @@ -641,6 +630,7 @@ rip6_bind(struct socket *so, struct sockaddr *nam, struct thread *td) struct ifaddr *ia = NULL; int error = 0; + KASSERT(inp != NULL, ("rip6_bind: inp == NULL")); if (nam->sa_len != sizeof(*addr)) return EINVAL; if (TAILQ_EMPTY(&ifnet) || addr->sin6_family != AF_INET6) @@ -674,6 +664,7 @@ rip6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) struct ifnet *ifp = NULL; int error = 0, scope_ambiguous = 0; + KASSERT(inp != NULL, ("rip6_connect: inp == NULL")); if (nam->sa_len != sizeof(*addr)) return EINVAL; if (TAILQ_EMPTY(&ifnet)) @@ -726,10 +717,9 @@ rip6_shutdown(struct socket *so) { struct inpcb *inp; - INP_INFO_RLOCK(&ripcbinfo); inp = sotoinpcb(so); + KASSERT(inp != NULL, ("rip6_shutdown: inp == NULL")); INP_LOCK(inp); - INP_INFO_RUNLOCK(&ripcbinfo); socantsendmore(so); INP_UNLOCK(inp); return 0; @@ -744,6 +734,7 @@ rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct sockaddr_in6 *dst; int ret; + KASSERT(inp != NULL, ("rip6_send: inp == NULL")); INP_INFO_WLOCK(&ripcbinfo); /* always copy sockaddr to avoid overwrites */ /* Unlocked read. */ diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 19b894f..e51f0da 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -501,20 +501,15 @@ static void udp6_abort(struct socket *so) { struct inpcb *inp; - int s; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return; /* ??? possible? panic instead? */ - } - soisdisconnected(so); - s = splnet(); + KASSERT(inp != NULL, ("udp6_abort: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); + soisdisconnected(so); in6_pcbdetach(inp); + in6_pcbfree(inp); INP_INFO_WUNLOCK(&udbinfo); - splx(s); } static int @@ -523,21 +518,15 @@ udp6_attach(struct socket *so, int proto, struct thread *td) struct inpcb *inp; int s, error; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp != 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } - + KASSERT(inp == NULL, ("udp6_attach: inp == NULL")); if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { error = soreserve(so, udp_sendspace, udp_recvspace); - if (error) { - INP_INFO_WUNLOCK(&udbinfo); + if (error) return error; - } } s = splnet(); + INP_INFO_WLOCK(&udbinfo); error = in_pcballoc(so, &udbinfo, "udp6inp"); splx(s); if (error) { @@ -569,12 +558,9 @@ udp6_bind(struct socket *so, struct sockaddr *nam, struct thread *td) struct inpcb *inp; int s, error; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } + KASSERT(inp != NULL, ("udp6_bind: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); inp->inp_vflag &= ~INP_IPV4; @@ -614,14 +600,10 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) struct inpcb *inp; int s, error; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } + KASSERT(inp != NULL, ("udp6_connect: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); - if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) { struct sockaddr_in6 *sin6_p; @@ -669,18 +651,13 @@ static void udp6_detach(struct socket *so) { struct inpcb *inp; - int s; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return; - } + KASSERT(inp != NULL, ("udp6_detach: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); - s = splnet(); in6_pcbdetach(inp); - splx(s); + in6_pcbfree(inp); INP_INFO_WUNLOCK(&udbinfo); } @@ -690,12 +667,9 @@ udp6_disconnect(struct socket *so) struct inpcb *inp; int error, s; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } + KASSERT(inp != NULL, ("udp6_disconnect: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); #ifdef INET @@ -732,13 +706,9 @@ udp6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct inpcb *inp; int error = 0; - INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - m_freem(m); - return EINVAL; - } + KASSERT(inp != NULL, ("udp6_send: inp == NULL")); + INP_INFO_WLOCK(&udbinfo); INP_LOCK(inp); if (addr) { |