Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.45 retrieving revision 1.68 diff -u -p -r1.45 -r1.68 --- src/sys/netinet/udp_usrreq.c 1999/01/11 22:35:07 1.45 +++ src/sys/netinet/udp_usrreq.c 2000/07/06 12:51:40 1.68 @@ -1,4 +1,33 @@ -/* $NetBSD: udp_usrreq.c,v 1.45 1999/01/11 22:35:07 thorpej Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.68 2000/07/06 12:51:40 itojun Exp $ */ + +/* + * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995 @@ -34,7 +63,9 @@ * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 */ -#include "ipkdb.h" + +#include "opt_ipsec.h" +#include "opt_ipkdb.h" #include #include @@ -46,8 +77,9 @@ #include #include #include +#include -#include +#include #include #include @@ -63,8 +95,32 @@ #include #include +#ifdef INET6 +#include +#include +#include +#include +#include +#endif + +#ifdef PULLDOWN_TEST +#ifndef INET6 +/* always need ip6.h for IP6_EXTHDR_GET */ +#include +#endif +#endif + #include +#ifdef IPSEC +#include +#include +#endif /*IPSEC*/ + +#ifdef IPKDB +#include +#endif + /* * UDP protocol implementation. * Per RFC 768, August, 1980. @@ -75,6 +131,18 @@ int udpcksum = 1; int udpcksum = 0; /* XXX */ #endif +static void udp4_sendup __P((struct mbuf *, int, struct sockaddr *, + struct socket *)); +static int udp4_realinput __P((struct sockaddr_in *, struct sockaddr_in *, + struct mbuf *, int)); +#ifdef INET6 +static void udp6_sendup __P((struct mbuf *, int, struct sockaddr *, + struct socket *)); +static int in6_mcmatch __P((struct in6pcb *, struct in6_addr *, + struct ifnet *)); +static int udp6_realinput __P((int, struct sockaddr_in6 *, + struct sockaddr_in6 *, struct mbuf *, int)); +#endif static void udp_notify __P((struct inpcb *, int)); #ifndef UDBHASHSIZE @@ -89,6 +157,7 @@ udp_init() in_pcbinit(&udbtable, udbhashsize, udbhashsize); } +#ifndef UDP6 void #if __STDC__ udp_input(struct mbuf *m, ...) @@ -98,18 +167,725 @@ udp_input(m, va_alist) va_dcl #endif { - register struct ip *ip; - register struct udphdr *uh; - register struct inpcb *inp; + va_list ap; + struct sockaddr_in src, dst; + struct ip *ip; + struct udphdr *uh; + int iphlen, proto; + int len; + int n; + + va_start(ap, m); + iphlen = va_arg(ap, int); + proto = va_arg(ap, int); + va_end(ap); + + udpstat.udps_ipackets++; + +#ifndef PULLDOWN_TEST + /* + * Strip IP options, if any; should skip this, + * make available to user, and use on returned packets, + * but we don't yet have a way to check the checksum + * with options still present. + */ + if (iphlen > sizeof (struct ip)) { + ip_stripoptions(m, (struct mbuf *)0); + iphlen = sizeof(struct ip); + } +#else + /* + * we may enable the above code if we save and pass IPv4 options + * to the userland. + */ +#endif + + /* + * Get IP and UDP header together in first mbuf. + */ + ip = mtod(m, struct ip *); +#ifndef PULLDOWN_TEST + if (m->m_len < iphlen + sizeof(struct udphdr)) { + if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) { + udpstat.udps_hdrops++; + return; + } + ip = mtod(m, struct ip *); + } + uh = (struct udphdr *)((caddr_t)ip + iphlen); +#else + IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr)); + if (uh == NULL) { + udpstat.udps_hdrops++; + return; + } +#endif + + /* destination port of 0 is illegal, based on RFC768. */ + if (uh->uh_dport == 0) + goto bad; + + /* + * Make mbuf data length reflect UDP length. + * If not enough data to reflect UDP length, drop. + */ + len = ntohs((u_int16_t)uh->uh_ulen); + if (ip->ip_len != iphlen + len) { + if (ip->ip_len < iphlen + len) { + udpstat.udps_badlen++; + goto bad; + } + m_adj(m, iphlen + len - ip->ip_len); + } + + /* + * Checksum extended UDP header and data. + */ + if (uh->uh_sum) { + if (in4_cksum(m, IPPROTO_UDP, iphlen, len) != 0) { + udpstat.udps_badsum++; + m_freem(m); + return; + } + } + + /* construct source and dst sockaddrs. */ + bzero(&src, sizeof(src)); + src.sin_family = AF_INET; + src.sin_len = sizeof(struct sockaddr_in); + bcopy(&ip->ip_src, &src.sin_addr, sizeof(src.sin_addr)); + src.sin_port = uh->uh_sport; + bzero(&dst, sizeof(dst)); + dst.sin_family = AF_INET; + dst.sin_len = sizeof(struct sockaddr_in); + bcopy(&ip->ip_dst, &dst.sin_addr, sizeof(dst.sin_addr)); + dst.sin_port = uh->uh_dport; + + n = udp4_realinput(&src, &dst, m, iphlen); +#ifdef INET6 + if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) { + struct sockaddr_in6 src6, dst6; + + bzero(&src6, sizeof(src6)); + src6.sin6_family = AF_INET6; + src6.sin6_len = sizeof(struct sockaddr_in6); + src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff; + bcopy(&ip->ip_src, &src6.sin6_addr.s6_addr[12], + sizeof(ip->ip_src)); + src6.sin6_port = uh->uh_sport; + bzero(&dst6, sizeof(dst6)); + dst6.sin6_family = AF_INET6; + dst6.sin6_len = sizeof(struct sockaddr_in6); + dst6.sin6_addr.s6_addr[10] = dst6.sin6_addr.s6_addr[11] = 0xff; + bcopy(&ip->ip_dst, &dst6.sin6_addr.s6_addr[12], + sizeof(ip->ip_dst)); + dst6.sin6_port = uh->uh_dport; + + n += udp6_realinput(AF_INET, &src6, &dst6, m, iphlen); + } +#endif + + if (n == 0) { + if (m->m_flags & (M_BCAST | M_MCAST)) { + udpstat.udps_noportbcast++; + goto bad; + } + udpstat.udps_noport++; +#ifdef IPKDB + if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport, + m, iphlen + sizeof(struct udphdr), + m->m_pkthdr.len - iphlen - sizeof(struct udphdr))) { + /* + * It was a debugger connect packet, + * just drop it now + */ + goto bad; + } +#endif + icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0); + m = NULL; + } + +bad: + if (m) + m_freem(m); +} + +#ifdef INET6 +int +udp6_input(mp, offp, proto) + struct mbuf **mp; + int *offp, proto; +{ + struct mbuf *m = *mp; + int off = *offp; + struct sockaddr_in6 src, dst; + struct ip6_hdr *ip6; + struct udphdr *uh; + u_int32_t plen, ulen; + +#if defined(NFAITH) && 0 < NFAITH + if (m->m_pkthdr.rcvif) { + if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) { + /* send icmp6 host unreach? */ + m_freem(m); + return IPPROTO_DONE; + } + } +#endif + + udp6stat.udp6s_ipackets++; + +#ifndef PULLDOWN_TEST + IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE); +#endif + + ip6 = mtod(m, struct ip6_hdr *); + /* check for jumbogram is done in ip6_input. we can trust pkthdr.len */ + plen = m->m_pkthdr.len - off; +#ifndef PULLDOWN_TEST + uh = (struct udphdr *)((caddr_t)ip6 + off); +#else + IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr)); + if (uh == NULL) { + ip6stat.ip6s_tooshort++; + return IPPROTO_DONE; + } +#endif + ulen = ntohs((u_short)uh->uh_ulen); + if (ulen == 0 && plen > 0xffff) + ulen = plen; + + if (plen != ulen) { + udp6stat.udp6s_badlen++; + goto bad; + } + + /* destination port of 0 is illegal, based on RFC768. */ + if (uh->uh_dport == 0) + goto bad; + + /* Be proactive about malicious use of IPv4 mapped address */ + if (IN6_IS_ADDR_V4MAPPED(&ip6->ip6_src) || + IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst)) { + /* XXX stat */ + goto bad; + } + + /* + * Checksum extended UDP header and data. + */ + if (uh->uh_sum == 0) + udp6stat.udp6s_nosum++; + else if (in6_cksum(m, IPPROTO_UDP, off, ulen) != 0) { + udp6stat.udp6s_badsum++; + goto bad; + } + + /* + * Construct source and dst sockaddrs. + * Note that ifindex (s6_addr16[1]) is already filled. + */ + bzero(&src, sizeof(src)); + src.sin6_family = AF_INET6; + src.sin6_len = sizeof(struct sockaddr_in6); + bcopy(&ip6->ip6_src, &src.sin6_addr, sizeof(src.sin6_addr)); + if (IN6_IS_SCOPE_LINKLOCAL(&src.sin6_addr)) + src.sin6_addr.s6_addr16[1] = 0; + if (m->m_pkthdr.rcvif) { + if (IN6_IS_SCOPE_LINKLOCAL(&src.sin6_addr)) + src.sin6_scope_id = m->m_pkthdr.rcvif->if_index; + else + src.sin6_scope_id = 0; + } + src.sin6_port = uh->uh_sport; + bzero(&dst, sizeof(dst)); + dst.sin6_family = AF_INET6; + dst.sin6_len = sizeof(struct sockaddr_in6); + bcopy(&ip6->ip6_dst, &dst.sin6_addr, sizeof(dst.sin6_addr)); + if (IN6_IS_SCOPE_LINKLOCAL(&dst.sin6_addr)) + dst.sin6_addr.s6_addr16[1] = 0; + if (m->m_pkthdr.rcvif) { + if (IN6_IS_SCOPE_LINKLOCAL(&dst.sin6_addr)) + dst.sin6_scope_id = m->m_pkthdr.rcvif->if_index; + else + dst.sin6_scope_id = 0; + } + dst.sin6_port = uh->uh_dport; + + if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) { + if (m->m_flags & M_MCAST) { + udp6stat.udp6s_noportmcast++; + goto bad; + } + udp6stat.udp6s_noport++; + icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); + m = NULL; + } + +bad: + if (m) + m_freem(m); + return IPPROTO_DONE; +} +#endif + +static void +udp4_sendup(m, off, src, so) + struct mbuf *m; + int off; /* offset of data portion */ + struct sockaddr *src; + struct socket *so; +{ + struct mbuf *opts = NULL; + struct mbuf *n; + struct inpcb *inp = NULL; +#ifdef INET6 + struct in6pcb *in6p = NULL; +#endif + + if (!so) + return; + switch (so->so_proto->pr_domain->dom_family) { + case AF_INET: + inp = sotoinpcb(so); + break; +#ifdef INET6 + case AF_INET6: + in6p = sotoin6pcb(so); + break; +#endif + default: + return; + } + +#ifdef IPSEC + /* check AH/ESP integrity. */ + if (so != NULL && ipsec4_in_reject_so(m, so)) { + ipsecstat.in_polvio++; + return; + } +#endif /*IPSEC*/ + + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { + if (inp && (inp->inp_flags & INP_CONTROLOPTS + || so->so_options & SO_TIMESTAMP)) { + struct ip *ip = mtod(n, struct ip *); + ip_savecontrol(inp, &opts, ip, n); + } + + m_adj(n, off); + if (sbappendaddr(&so->so_rcv, src, n, + opts) == 0) { + m_freem(n); + if (opts) + m_freem(opts); + } else + sorwakeup(so); + } +} + +#ifdef INET6 +static void +udp6_sendup(m, off, src, so) + struct mbuf *m; + int off; /* offset of data portion */ + struct sockaddr *src; + struct socket *so; +{ + struct mbuf *opts = NULL; + struct mbuf *n; + struct in6pcb *in6p = NULL; + + if (!so) + return; + if (so->so_proto->pr_domain->dom_family != AF_INET6) + return; + in6p = sotoin6pcb(so); + +#ifdef IPSEC + /* check AH/ESP integrity. */ + if (so != NULL && ipsec6_in_reject_so(m, so)) { + ipsec6stat.in_polvio++; + return; + } +#endif /*IPSEC*/ + + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { + if (in6p && (in6p->in6p_flags & IN6P_CONTROLOPTS + || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { + struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *); + ip6_savecontrol(in6p, &opts, ip6, n); + } + + m_adj(n, off); + if (sbappendaddr(&so->so_rcv, src, n, opts) == 0) { + m_freem(n); + if (opts) + m_freem(opts); + udp6stat.udp6s_fullsock++; + } else + sorwakeup(so); + } +} +#endif + +static int +udp4_realinput(src, dst, m, off) + struct sockaddr_in *src; + struct sockaddr_in *dst; + struct mbuf *m; + int off; /* offset of udphdr */ +{ + u_int16_t *sport, *dport; + int rcvcnt; + struct in_addr *src4, *dst4; + struct inpcb *inp; + + rcvcnt = 0; + off += sizeof(struct udphdr); /* now, offset of payload */ + + if (src->sin_family != AF_INET || dst->sin_family != AF_INET) + goto bad; + + src4 = &src->sin_addr; + sport = &src->sin_port; + dst4 = &dst->sin_addr; + dport = &dst->sin_port; + + if (IN_MULTICAST(src4->s_addr) || + in_broadcast(*dst4, m->m_pkthdr.rcvif)) { + struct inpcb *last; + /* + * Deliver a multicast or broadcast datagram to *all* sockets + * for which the local and remote addresses and ports match + * those of the incoming datagram. This allows more than + * one process to receive multi/broadcasts on the same port. + * (This really ought to be done for unicast datagrams as + * well, but that would cause problems with existing + * applications that open both address-specific sockets and + * a wildcard socket listening to the same port -- they would + * end up receiving duplicates of every unicast datagram. + * Those applications open the multiple sockets to overcome an + * inadequacy of the UDP socket interface, but for backwards + * compatibility we avoid the problem here rather than + * fixing the interface. Maybe 4.5BSD will remedy this?) + */ + + /* + * KAME note: usually we drop udpiphdr from mbuf here. + * we need udpiphdr for iPsec processing so we do that later. + */ + /* + * Locate pcb(s) for datagram. + */ + for (inp = udbtable.inpt_queue.cqh_first; + inp != (struct inpcb *)&udbtable.inpt_queue; + inp = inp->inp_queue.cqe_next) { + if (inp->inp_lport != *dport) + continue; + if (!in_nullhost(inp->inp_laddr)) { + if (!in_hosteq(inp->inp_laddr, *dst4)) + continue; + } + if (!in_nullhost(inp->inp_faddr)) { + if (!in_hosteq(inp->inp_faddr, *src4) || + inp->inp_fport != *sport) + continue; + } + + last = inp; + udp4_sendup(m, off, (struct sockaddr *)src, + inp->inp_socket); + rcvcnt++; + + /* + * Don't look for additional matches if this one does + * not have either the SO_REUSEPORT or SO_REUSEADDR + * socket options set. This heuristic avoids searching + * through all pcbs in the common case of a non-shared + * port. It assumes that an application will never + * clear these options after setting them. + */ + if ((inp->inp_socket->so_options & + (SO_REUSEPORT|SO_REUSEADDR)) == 0) + break; + } + +#if 0 + if (last == NULL) { + /* + * No matching pcb found; discard datagram. + * (No need to send an ICMP Port Unreachable + * for a broadcast or multicast datgram.) + */ + udpstat.udps_noportbcast++; + goto bad; + } +#endif + } else { + /* + * Locate pcb for datagram. + */ + inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, *dport); + if (inp == 0) { + ++udpstat.udps_pcbhashmiss; + inp = in_pcblookup_bind(&udbtable, *dst4, *dport); + if (inp == 0) { +#if 0 + struct mbuf *n; + + if (m->m_flags & (M_BCAST | M_MCAST)) { + udpstat.udps_noportbcast++; + goto bad; + } + udpstat.udps_noport++; +#ifdef IPKDB + if (checkipkdb(src4, *sport, *dport, m, off, + m->m_pkthdr.len - off)) { + /* + * It was a debugger connect packet, + * just drop it now + */ + goto bad; + } +#endif + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { + icmp_error(n, ICMP_UNREACH, + ICMP_UNREACH_PORT, 0, 0); + } +#endif + return rcvcnt; + } + } + + udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); + rcvcnt++; + } + +bad: + return rcvcnt; +} + +#ifdef INET6 +static int +in6_mcmatch(in6p, ia6, ifp) + struct in6pcb *in6p; + struct in6_addr *ia6; + struct ifnet *ifp; +{ + struct ip6_moptions *im6o = in6p->in6p_moptions; + struct in6_multi_mship *imm; + + if (im6o == NULL) + return 0; + + for (imm = im6o->im6o_memberships.lh_first; imm != NULL; + imm = imm->i6mm_chain.le_next) { + if ((ifp == NULL || + imm->i6mm_maddr->in6m_ifp == ifp) && + IN6_ARE_ADDR_EQUAL(&imm->i6mm_maddr->in6m_addr, + ia6)) + return 1; + } + return 0; +} + +static int +udp6_realinput(af, src, dst, m, off) + int af; /* af on packet */ + struct sockaddr_in6 *src; + struct sockaddr_in6 *dst; + struct mbuf *m; + int off; /* offset of udphdr */ +{ + u_int16_t *sport, *dport; + int rcvcnt; + struct in6_addr *src6, *dst6; + struct in_addr *src4; + struct in6pcb *in6p; + + rcvcnt = 0; + off += sizeof(struct udphdr); /* now, offset of payload */ + + if (af != AF_INET && af != AF_INET6) + goto bad; + if (src->sin6_family != AF_INET6 || dst->sin6_family != AF_INET6) + goto bad; + + src6 = &src->sin6_addr; + sport = &src->sin6_port; + dst6 = &dst->sin6_addr; + dport = &dst->sin6_port; + src4 = (struct in_addr *)&src->sin6_addr.s6_addr32[12]; + + if (IN6_IS_ADDR_MULTICAST(dst6) + || (af == AF_INET && IN_MULTICAST(src4->s_addr))) { + struct in6pcb *last; + /* + * Deliver a multicast or broadcast datagram to *all* sockets + * for which the local and remote addresses and ports match + * those of the incoming datagram. This allows more than + * one process to receive multi/broadcasts on the same port. + * (This really ought to be done for unicast datagrams as + * well, but that would cause problems with existing + * applications that open both address-specific sockets and + * a wildcard socket listening to the same port -- they would + * end up receiving duplicates of every unicast datagram. + * Those applications open the multiple sockets to overcome an + * inadequacy of the UDP socket interface, but for backwards + * compatibility we avoid the problem here rather than + * fixing the interface. Maybe 4.5BSD will remedy this?) + */ + + /* + * KAME note: usually we drop udpiphdr from mbuf here. + * we need udpiphdr for iPsec processing so we do that later. + */ + /* + * Locate pcb(s) for datagram. + */ + for (in6p = udb6.in6p_next; in6p != &udb6; + in6p = in6p->in6p_next) { + if (in6p->in6p_lport != *dport) + continue; + if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { + if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, dst6) + && !in6_mcmatch(in6p, dst6, m->m_pkthdr.rcvif)) + continue; + } +#ifndef INET6_BINDV6ONLY + else { + if (IN6_IS_ADDR_V4MAPPED(dst6) + && (in6p->in6p_flags & IN6P_BINDV6ONLY)) + continue; + } +#endif + if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) { + if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, src6) + || in6p->in6p_fport != *sport) + continue; + } +#ifndef INET6_BINDV6ONLY + else { + if (IN6_IS_ADDR_V4MAPPED(src6) + && (in6p->in6p_flags & IN6P_BINDV6ONLY)) + continue; + } +#endif + + last = in6p; + udp6_sendup(m, off, (struct sockaddr *)src, + in6p->in6p_socket); + rcvcnt++; + + /* + * Don't look for additional matches if this one does + * not have either the SO_REUSEPORT or SO_REUSEADDR + * socket options set. This heuristic avoids searching + * through all pcbs in the common case of a non-shared + * port. It assumes that an application will never + * clear these options after setting them. + */ + if ((in6p->in6p_socket->so_options & + (SO_REUSEPORT|SO_REUSEADDR)) == 0) + break; + } + +#if 0 + if (last == NULL) { + /* + * No matching pcb found; discard datagram. + * (No need to send an ICMP Port Unreachable + * for a broadcast or multicast datgram.) + */ + switch (af) { + case AF_INET: + udpstat.udps_noportbcast++; + break; + case AF_INET6: + udp6stat.udp6s_noportmcast++; + break; + } + goto bad; + } +#endif + } else { + /* + * Locate pcb for datagram. + */ + in6p = in6_pcblookup_connect(&udb6, src6, *sport, + dst6, *dport, 0); + if (in6p == 0) { + ++udpstat.udps_pcbhashmiss; + in6p = in6_pcblookup_bind(&udb6, dst6, *dport, 0); + if (in6p == 0) { +#if 0 + struct mbuf *n; + n = m_copy(m, 0, M_COPYALL); + switch (af) { + case AF_INET: + if (m->m_flags & (M_BCAST | M_MCAST)) { + udpstat.udps_noportbcast++; + goto bad; + } + udpstat.udps_noport++; + if (n != NULL) + icmp_error(n, ICMP_UNREACH, + ICMP_UNREACH_PORT, 0, 0); + break; + case AF_INET6: + if (m->m_flags & M_MCAST) { + udp6stat.udp6s_noportmcast++; + goto bad; + } + udp6stat.udp6s_noport++; + if (n != NULL) + icmp6_error(n, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_NOPORT, 0); + break; + } +#endif + + return rcvcnt; + } + } + + udp6_sendup(m, off, (struct sockaddr *)src, in6p->in6p_socket); + rcvcnt++; + } + +bad: + return rcvcnt; +} +#endif + +#else /*UDP6*/ + +void +#if __STDC__ +udp_input(struct mbuf *m, ...) +#else +udp_input(m, va_alist) + struct mbuf *m; + va_dcl +#endif +{ + int proto; + struct ip *ip; + struct udphdr *uh; + struct inpcb *inp; struct mbuf *opts = 0; int len; struct ip save_ip; int iphlen; va_list ap; struct sockaddr_in udpsrc; + struct sockaddr *sa; va_start(ap, m); iphlen = va_arg(ap, int); + proto = va_arg(ap, int); va_end(ap); udpstat.udps_ipackets++; @@ -138,18 +914,21 @@ udp_input(m, va_alist) } uh = (struct udphdr *)((caddr_t)ip + iphlen); + /* destination port of 0 is illegal, based on RFC768. */ + if (uh->uh_dport == 0) + goto bad; + /* * Make mbuf data length reflect UDP length. * If not enough data to reflect UDP length, drop. */ len = ntohs((u_int16_t)uh->uh_ulen); - if (ip->ip_len != len) { - if (len > ip->ip_len) { + if (ip->ip_len != iphlen + len) { + if (ip->ip_len < iphlen + len) { udpstat.udps_badlen++; goto bad; } - m_adj(m, len - ip->ip_len); - /* ip->ip_len = len; */ + m_adj(m, iphlen + len - ip->ip_len); } /* * Save a copy of the IP header in case we want restore it @@ -164,13 +943,22 @@ udp_input(m, va_alist) bzero(((struct ipovly *)ip)->ih_x1, sizeof ((struct ipovly *)ip)->ih_x1); ((struct ipovly *)ip)->ih_len = uh->uh_ulen; - if ((uh->uh_sum = in_cksum(m, len + sizeof (struct ip))) != 0) { + if (in_cksum(m, len + sizeof (struct ip)) != 0) { udpstat.udps_badsum++; m_freem(m); return; } } + /* + * Construct sockaddr format source address. + */ + udpsrc.sin_family = AF_INET; + udpsrc.sin_len = sizeof(struct sockaddr_in); + udpsrc.sin_addr = ip->ip_src; + udpsrc.sin_port = uh->uh_sport; + bzero((caddr_t)udpsrc.sin_zero, sizeof(udpsrc.sin_zero)); + if (IN_MULTICAST(ip->ip_dst.s_addr) || in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) { struct inpcb *last; @@ -190,19 +978,11 @@ udp_input(m, va_alist) * fixing the interface. Maybe 4.5BSD will remedy this?) */ + iphlen += sizeof(struct udphdr); /* - * Construct sockaddr format source address. + * KAME note: usually we drop udpiphdr from mbuf here. + * we need udpiphdr for iPsec processing so we do that later. */ - udpsrc.sin_family = AF_INET; - udpsrc.sin_len = sizeof(struct sockaddr_in); - udpsrc.sin_addr = ip->ip_src; - udpsrc.sin_port = uh->uh_sport; - bzero((caddr_t)udpsrc.sin_zero, sizeof(udpsrc.sin_zero)); - - iphlen += sizeof(struct udphdr); - m->m_len -= iphlen; - m->m_pkthdr.len -= iphlen; - m->m_data += iphlen; /* * Locate pcb(s) for datagram. * (Algorithm copied from raw_intr().) @@ -226,6 +1006,13 @@ udp_input(m, va_alist) if (last != NULL) { struct mbuf *n; +#ifdef IPSEC + /* check AH/ESP integrity. */ + if (last != NULL && ipsec4_in_reject(m, last)) { + ipsecstat.in_polvio++; + /* do not inject data to pcb */ + } else +#endif /*IPSEC*/ if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { if (last->inp_flags & INP_CONTROLOPTS || last->inp_socket->so_options & @@ -233,9 +1020,11 @@ udp_input(m, va_alist) ip_savecontrol(last, &opts, ip, n); } + m_adj(n, iphlen); + sa = (struct sockaddr *)&udpsrc; if (sbappendaddr( &last->inp_socket->so_rcv, - sintosa(&udpsrc), n, opts) == 0) { + sa, n, opts) == 0) { m_freem(n); if (opts) m_freem(opts); @@ -267,11 +1056,21 @@ udp_input(m, va_alist) udpstat.udps_noportbcast++; goto bad; } +#ifdef IPSEC + /* check AH/ESP integrity. */ + if (last != NULL && ipsec4_in_reject(m, last)) { + ipsecstat.in_polvio++; + goto bad; + } +#endif /*IPSEC*/ if (last->inp_flags & INP_CONTROLOPTS || last->inp_socket->so_options & SO_TIMESTAMP) ip_savecontrol(last, &opts, ip, m); - if (sbappendaddr(&last->inp_socket->so_rcv, - sintosa(&udpsrc), m, opts) == 0) { + m->m_len -= iphlen; + m->m_pkthdr.len -= iphlen; + m->m_data += iphlen; + sa = (struct sockaddr *)&udpsrc; + if (sbappendaddr(&last->inp_socket->so_rcv, sa, m, opts) == 0) { udpstat.udps_fullsock++; goto bad; } @@ -287,13 +1086,13 @@ udp_input(m, va_alist) ++udpstat.udps_pcbhashmiss; inp = in_pcblookup_bind(&udbtable, ip->ip_dst, uh->uh_dport); if (inp == 0) { - udpstat.udps_noport++; if (m->m_flags & (M_BCAST | M_MCAST)) { udpstat.udps_noportbcast++; goto bad; } + udpstat.udps_noport++; *ip = save_ip; -#if NIPKDB > 0 +#ifdef IPKDB if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport, @@ -303,22 +1102,20 @@ udp_input(m, va_alist) /* It was a debugger connect packet, just drop it now */ goto bad; #endif - ip->ip_len += iphlen; icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0); return; } } +#ifdef IPSEC + if (inp != NULL && ipsec4_in_reject(m, inp)) { + ipsecstat.in_polvio++; + goto bad; + } +#endif /*IPSEC*/ /* - * Construct sockaddr format source address. * Stuff source address and datagram in user buffer. */ - udpsrc.sin_family = AF_INET; - udpsrc.sin_len = sizeof(struct sockaddr_in); - udpsrc.sin_addr = ip->ip_src; - udpsrc.sin_port = uh->uh_sport; - bzero((caddr_t)udpsrc.sin_zero, sizeof(udpsrc.sin_zero)); - if (inp->inp_flags & INP_CONTROLOPTS || inp->inp_socket->so_options & SO_TIMESTAMP) ip_savecontrol(inp, &opts, ip, m); @@ -326,8 +1123,8 @@ udp_input(m, va_alist) m->m_len -= iphlen; m->m_pkthdr.len -= iphlen; m->m_data += iphlen; - if (sbappendaddr(&inp->inp_socket->so_rcv, sintosa(&udpsrc), m, - opts) == 0) { + sa = (struct sockaddr *)&udpsrc; + if (sbappendaddr(&inp->inp_socket->so_rcv, sa, m, opts) == 0) { udpstat.udps_fullsock++; goto bad; } @@ -338,6 +1135,7 @@ bad: if (opts) m_freem(opts); } +#endif /*UDP6*/ /* * Notify a udp user of an asynchronous error; @@ -345,7 +1143,7 @@ bad: */ static void udp_notify(inp, errno) - register struct inpcb *inp; + struct inpcb *inp; int errno; { @@ -360,12 +1158,14 @@ udp_ctlinput(cmd, sa, v) struct sockaddr *sa; void *v; { - register struct ip *ip = v; - register struct udphdr *uh; - extern int inetctlerrmap[]; + struct ip *ip = v; + struct udphdr *uh; void (*notify) __P((struct inpcb *, int)) = udp_notify; int errno; + if (sa->sa_family != AF_INET + || sa->sa_len != sizeof(struct sockaddr_in)) + return NULL; if ((unsigned)cmd >= PRC_NCMDS) return NULL; errno = inetctlerrmap[cmd]; @@ -379,6 +1179,8 @@ udp_ctlinput(cmd, sa, v) uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); in_pcbnotify(&udbtable, satosin(sa)->sin_addr, uh->uh_dport, ip->ip_src, uh->uh_sport, errno, notify); + + /* XXX mapped address case */ } else in_pcbnotifyall(&udbtable, satosin(sa)->sin_addr, errno, notify); @@ -394,9 +1196,9 @@ udp_output(m, va_alist) va_dcl #endif { - register struct inpcb *inp; - register struct udpiphdr *ui; - register int len = m->m_pkthdr.len; + struct inpcb *inp; + struct udpiphdr *ui; + int len = m->m_pkthdr.len; int error = 0; va_list ap; @@ -449,6 +1251,11 @@ udp_output(m, va_alist) ((struct ip *)ui)->ip_ttl = inp->inp_ip.ip_ttl; /* XXX */ ((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos; /* XXX */ udpstat.udps_opackets++; + +#ifdef IPSEC + ipsec_setsocket(m, inp->inp_socket); +#endif /*IPSEC*/ + return (ip_output(m, inp->inp_options, &inp->inp_route, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST), inp->inp_moptions)); @@ -470,14 +1277,20 @@ udp_usrreq(so, req, m, nam, control, p) struct mbuf *m, *nam, *control; struct proc *p; { - register struct inpcb *inp; + struct inpcb *inp; int s; - register int error = 0; + int error = 0; if (req == PRU_CONTROL) return (in_control(so, (long)m, (caddr_t)nam, (struct ifnet *)control, p)); + if (req == PRU_PURGEIF) { + in_purgeif((struct ifnet *)control); + in_pcbpurgeif(&udbtable, (struct ifnet *)control); + return (0); + } + s = splsoftnet(); inp = sotoinpcb(so); #ifdef DIAGNOSTIC @@ -510,6 +1323,13 @@ udp_usrreq(so, req, m, nam, control, p) break; inp = sotoinpcb(so); inp->inp_ip.ip_ttl = ip_defttl; +#ifdef IPSEC + error = ipsec_init_policy(so, &inp->inp_sp); + if (error != 0) { + in_pcbdetach(inp); + break; + } +#endif /*IPSEC*/ break; case PRU_DETACH: