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.140 retrieving revision 1.146.4.1 diff -u -p -r1.140 -r1.146.4.1 --- src/sys/netinet/udp_usrreq.c 2005/08/10 13:05:17 1.140 +++ src/sys/netinet/udp_usrreq.c 2006/04/22 11:40:11 1.146.4.1 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.140 2005/08/10 13:05:17 yamt Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.146.4.1 2006/04/22 11:40:11 simonb Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.140 2005/08/10 13:05:17 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.146.4.1 2006/04/22 11:40:11 simonb Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -95,17 +95,13 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #include -#ifdef IPSEC_NAT_T -#include -#include -#endif - #ifdef INET6 #include #include #include #include #include +#include #endif #ifndef INET6 @@ -123,6 +119,7 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #ifdef FAST_IPSEC #include #include /* XXX ipsecstat namespace */ +#include #ifdef INET6 #include #endif @@ -130,6 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #ifdef IPSEC #include +#include #include #endif /*IPSEC*/ @@ -146,19 +144,20 @@ int udpcksum = 1; #else int udpcksum = 0; /* XXX */ #endif +int udp_do_loopback_cksum = 0; struct inpcbtable udbtable; struct udpstat udpstat; #ifdef INET #ifdef IPSEC_NAT_T -static int udp4_espinudp (struct mbuf *, int, struct sockaddr *, +static int udp4_espinudp (struct mbuf **, int, struct sockaddr *, struct socket *); #endif static void udp4_sendup (struct mbuf *, int, struct sockaddr *, struct socket *); static int udp4_realinput (struct sockaddr_in *, struct sockaddr_in *, - struct mbuf *, int); + struct mbuf **, int); static int udp4_input_checksum(struct mbuf *, const struct udphdr *, int, int); #endif #ifdef INET6 @@ -400,7 +399,10 @@ udp_input(struct mbuf *m, ...) bcopy(&ip->ip_dst, &dst.sin_addr, sizeof(dst.sin_addr)); dst.sin_port = uh->uh_dport; - n = udp4_realinput(&src, &dst, m, iphlen); + if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) { + udpstat.udps_hdrops++; + return; + } #ifdef INET6 if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) { struct sockaddr_in6 src6, dst6; @@ -571,19 +573,16 @@ udp6_input(struct mbuf **mp, int *offp, /* * 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); - /* KAME hack: recover scopeid */ - (void)in6_recoverscope(&src, &ip6->ip6_src, m->m_pkthdr.rcvif); + src.sin6_addr = ip6->ip6_src; src.sin6_port = uh->uh_sport; bzero(&dst, sizeof(dst)); dst.sin6_family = AF_INET6; dst.sin6_len = sizeof(struct sockaddr_in6); - /* KAME hack: recover scopeid */ - (void)in6_recoverscope(&dst, &ip6->ip6_dst, m->m_pkthdr.rcvif); + dst.sin6_addr = ip6->ip6_dst; dst.sin6_port = uh->uh_dport; if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) { @@ -707,13 +706,14 @@ udp6_sendup(struct mbuf *m, int off /* o #ifdef INET static int udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst, - struct mbuf *m, int off /* offset of udphdr */) + struct mbuf **mp, int off /* offset of udphdr */) { u_int16_t *sport, *dport; int rcvcnt; struct in_addr *src4, *dst4; struct inpcb_hdr *inph; struct inpcb *inp; + struct mbuf *m = *mp; rcvcnt = 0; off += sizeof(struct udphdr); /* now, offset of payload */ @@ -801,12 +801,26 @@ udp4_realinput(struct sockaddr_in *src, if (inp->inp_flags & INP_ESPINUDP_ALL) { struct sockaddr *sa = (struct sockaddr *)src; - if (udp4_espinudp(m, off, sa, inp->inp_socket) != 0) { + switch(udp4_espinudp(mp, off, sa, inp->inp_socket)) { + case -1: /* Error, m was freeed */ + rcvcnt = -1; + goto bad; + break; + + case 1: /* ESP over UDP */ rcvcnt++; goto bad; - } + break; - /* Normal UDP processing will take place */ + case 0: /* plain UDP */ + default: /* Unexpected */ + /* + * Normal UDP processing will take place + * m may have changed. + */ + m = *mp; + break; + } } #endif @@ -826,7 +840,7 @@ udp6_realinput(int af, struct sockaddr_i { u_int16_t sport, dport; int rcvcnt; - struct in6_addr src6, dst6; + struct in6_addr src6, *dst6; const struct in_addr *dst4; struct inpcb_hdr *inph; struct in6pcb *in6p; @@ -839,13 +853,18 @@ udp6_realinput(int af, struct sockaddr_i if (src->sin6_family != AF_INET6 || dst->sin6_family != AF_INET6) goto bad; - in6_embedscope(&src6, src, NULL, NULL); + src6 = src->sin6_addr; + if (sa6_recoverscope(src) != 0) { + /* XXX: should be impossible. */ + goto bad; + } sport = src->sin6_port; - in6_embedscope(&dst6, dst, NULL, NULL); + dport = dst->sin6_port; dst4 = (struct in_addr *)&dst->sin6_addr.s6_addr[12]; + dst6 = &dst->sin6_addr; - if (IN6_IS_ADDR_MULTICAST(&dst6) || + if (IN6_IS_ADDR_MULTICAST(dst6) || (af == AF_INET && IN_MULTICAST(dst4->s_addr))) { /* * Deliver a multicast or broadcast datagram to *all* sockets @@ -878,10 +897,11 @@ udp6_realinput(int af, struct sockaddr_i if (in6p->in6p_lport != dport) continue; if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { - if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, &dst6)) + if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, + dst6)) continue; } else { - if (IN6_IS_ADDR_V4MAPPED(&dst6) && + if (IN6_IS_ADDR_V4MAPPED(dst6) && (in6p->in6p_flags & IN6P_IPV6_V6ONLY)) continue; } @@ -915,11 +935,11 @@ udp6_realinput(int af, struct sockaddr_i /* * Locate pcb for datagram. */ - in6p = in6_pcblookup_connect(&udbtable, &src6, sport, - &dst6, dport, 0); + in6p = in6_pcblookup_connect(&udbtable, &src6, sport, dst6, + dport, 0); if (in6p == 0) { ++udpstat.udps_pcbhashmiss; - in6p = in6_pcblookup_bind(&udbtable, &dst6, dport, 0); + in6p = in6_pcblookup_bind(&udbtable, dst6, dport, 0); if (in6p == 0) return rcvcnt; } @@ -1156,12 +1176,14 @@ int udp_recvspace = 40 * (1024 + sizeof( /*ARGSUSED*/ int udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, - struct mbuf *control, struct proc *p) + struct mbuf *control, struct lwp *l) { struct inpcb *inp; + struct proc *p; int s; int error = 0; + p = l ? l->l_proc : NULL; if (req == PRU_CONTROL) return (in_control(so, (long)m, (caddr_t)nam, (struct ifnet *)control, p)); @@ -1225,7 +1247,7 @@ udp_usrreq(struct socket *so, int req, s break; case PRU_CONNECT: - error = in_pcbconnect(inp, nam); + error = in_pcbconnect(inp, nam, p); if (error) break; soisconnected(so); @@ -1267,7 +1289,7 @@ udp_usrreq(struct socket *so, int req, s error = EISCONN; goto die; } - error = in_pcbconnect(inp, nam); + error = in_pcbconnect(inp, nam, p); if (error) goto die; } else { @@ -1396,10 +1418,11 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, * Returns: * 1 if the packet was processed * 0 if normal UDP processing should take place + * -1 if an error occurent and m was freed */ static int -udp4_espinudp(m, off, src, so) - struct mbuf *m; +udp4_espinudp(mp, off, src, so) + struct mbuf **mp; int off; struct sockaddr *src; struct socket *so; @@ -1415,6 +1438,7 @@ udp4_espinudp(m, off, src, so) struct m_tag *tag; struct udphdr *udphdr; u_int16_t sport, dport; + struct mbuf *m = *mp; /* * Collapse the mbuf chain if the first mbuf is too short @@ -1425,10 +1449,11 @@ udp4_espinudp(m, off, src, so) minlen = m->m_pkthdr.len; if (m->m_len < minlen) { - if ((m = m_pullup(m, minlen)) == NULL) { + if ((*mp = m_pullup(m, minlen)) == NULL) { printf("udp4_espinudp: m_pullup failed\n"); - return 0; + return -1; } + m = *mp; } len = m->m_len - off; @@ -1455,10 +1480,10 @@ udp4_espinudp(m, off, src, so) } if (inp->inp_flags & INP_ESPINUDP_NON_IKE) { - u_int64_t *st = (u_int64_t *)data; + u_int32_t *st = (u_int32_t *)data; if ((len <= sizeof(u_int64_t) + sizeof(struct esp)) - || (*st != 0)) + || ((st[0] | st[1]) != 0)) return 0; /* Normal UDP processing */ skip = sizeof(struct udphdr) + sizeof(u_int64_t); @@ -1521,7 +1546,11 @@ udp4_espinudp(m, off, src, so) ((u_int16_t *)(tag + 1))[1] = dport; m_tag_prepend(n, tag); +#ifdef FAST_IPSEC + ipsec4_common_input(n, iphdrlen); +#else esp4_input(n, iphdrlen); +#endif /* We handled it, it shoudln't be handled by UDP */ return 1;