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.165 retrieving revision 1.183.2.1 diff -u -p -r1.165 -r1.183.2.1 --- src/sys/netinet/udp_usrreq.c 2008/04/08 23:37:43 1.165 +++ src/sys/netinet/udp_usrreq.c 2012/04/17 00:08:41 1.183.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.165 2008/04/08 23:37:43 thorpej Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.183.2.1 2012/04/17 00:08:41 yamt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,9 +61,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.165 2008/04/08 23:37:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.183.2.1 2012/04/17 00:08:41 yamt Exp $"); #include "opt_inet.h" +#include "opt_compat_netbsd.h" #include "opt_ipsec.h" #include "opt_inet_csum.h" #include "opt_ipkdb.h" @@ -94,13 +95,17 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #include #include +#include +#include #ifdef INET6 #include #include #include +#include #include #include +#include #include #endif @@ -114,22 +119,19 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #endif -#include - #ifdef FAST_IPSEC #include -#include /* XXX ipsecstat namespace */ +#include +#include #include #ifdef INET6 #include #endif -#endif /* FAST_IPSEC*/ +#endif /* FAST_IPSEC */ -#ifdef IPSEC -#include -#include -#include -#endif /*IPSEC*/ +#ifdef COMPAT_50 +#include +#endif #ifdef IPKDB #include @@ -144,7 +146,7 @@ int udp_do_loopback_cksum = 0; struct inpcbtable udbtable; -uint64_t udpstat[UDP_NSTATS]; +percpu_t *udpstat_percpu; #ifdef INET #ifdef IPSEC_NAT_T @@ -222,15 +224,26 @@ EVCNT_ATTACH_STATIC(udp6_swcsum); #endif /* UDP_CSUM_COUNTERS */ +static void sysctl_net_inet_udp_setup(struct sysctllog **); + void udp_init(void) { + sysctl_net_inet_udp_setup(NULL); + in_pcbinit(&udbtable, udbhashsize, udbhashsize); MOWNER_ATTACH(&udp_tx_mowner); MOWNER_ATTACH(&udp_rx_mowner); MOWNER_ATTACH(&udp_mowner); + +#ifdef INET + udpstat_percpu = percpu_alloc(sizeof(uint64_t) * UDP_NSTATS); +#endif +#ifdef INET6 + udp6stat_percpu = percpu_alloc(sizeof(uint64_t) * UDP6_NSTATS); +#endif } /* @@ -325,7 +338,7 @@ udp4_input_checksum(struct mbuf *m, cons return 0; badcsum: - udpstat[UDP_STAT_BADSUM]++; + UDP_STATINC(UDP_STAT_BADSUM); return -1; } @@ -347,7 +360,7 @@ udp_input(struct mbuf *m, ...) va_end(ap); MCLAIM(m, &udp_rx_mowner); - udpstat[UDP_STAT_IPACKETS]++; + UDP_STATINC(UDP_STAT_IPACKETS); /* * Get IP and UDP header together in first mbuf. @@ -355,7 +368,7 @@ udp_input(struct mbuf *m, ...) ip = mtod(m, struct ip *); IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr)); if (uh == NULL) { - udpstat[UDP_STAT_HDROPS]++; + UDP_STATINC(UDP_STAT_HDROPS); return; } KASSERT(UDP_HDR_ALIGNED_P(uh)); @@ -372,7 +385,7 @@ udp_input(struct mbuf *m, ...) len = ntohs((u_int16_t)uh->uh_ulen); if (ip_len != iphlen + len) { if (ip_len < iphlen + len || len < sizeof(struct udphdr)) { - udpstat[UDP_STAT_BADLEN]++; + UDP_STATINC(UDP_STAT_BADLEN); goto bad; } m_adj(m, iphlen + len - ip_len); @@ -389,25 +402,25 @@ udp_input(struct mbuf *m, ...) sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport); if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) { - udpstat[UDP_STAT_HDROPS]++; + UDP_STATINC(UDP_STAT_HDROPS); return; } #ifdef INET6 if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) { struct sockaddr_in6 src6, dst6; - bzero(&src6, sizeof(src6)); + memset(&src6, 0, 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], + memcpy(&src6.sin6_addr.s6_addr[12], &ip->ip_src, sizeof(ip->ip_src)); src6.sin6_port = uh->uh_sport; - bzero(&dst6, sizeof(dst6)); + memset(&dst6, 0, 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], + memcpy(&dst6.sin6_addr.s6_addr[12], &ip->ip_dst, sizeof(ip->ip_dst)); dst6.sin6_port = uh->uh_dport; @@ -417,10 +430,10 @@ udp_input(struct mbuf *m, ...) if (n == 0) { if (m->m_flags & (M_BCAST | M_MCAST)) { - udpstat[UDP_STAT_NOPORTBCAST]++; + UDP_STATINC(UDP_STAT_NOPORTBCAST); goto bad; } - udpstat[UDP_STAT_NOPORT]++; + UDP_STATINC(UDP_STAT_NOPORT); #ifdef IPKDB if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport, m, iphlen + sizeof(struct udphdr), @@ -460,7 +473,7 @@ udp6_input_checksum(struct mbuf *m, cons goto good; } if (uh->uh_sum == 0) { - udp6stat.udp6s_nosum++; + UDP6_STATINC(UDP6_STAT_NOSUM); goto bad; } @@ -469,7 +482,7 @@ udp6_input_checksum(struct mbuf *m, cons M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { case M_CSUM_UDPv6|M_CSUM_TCP_UDP_BAD: UDP_CSUM_COUNTER_INCR(&udp6_hwcsum_bad); - udp6stat.udp6s_badsum++; + UDP6_STATINC(UDP6_STAT_BADSUM); goto bad; #if 0 /* notyet */ @@ -488,7 +501,7 @@ udp6_input_checksum(struct mbuf *m, cons */ UDP_CSUM_COUNTER_INCR(&udp6_swcsum); if (in6_cksum(m, IPPROTO_UDP, off, len) != 0) { - udp6stat.udp6s_badsum++; + UDP6_STATINC(UDP6_STAT_BADSUM); goto bad; } } @@ -519,13 +532,13 @@ udp6_input(struct mbuf **mp, int *offp, } #endif - udp6stat.udp6s_ipackets++; + UDP6_STATINC(UDP6_STAT_IPACKETS); /* check for jumbogram is done in ip6_input. we can trust pkthdr.len */ plen = m->m_pkthdr.len - off; IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr)); if (uh == NULL) { - ip6stat[IP6_STAT_TOOSHORT]++; + IP6_STATINC(IP6_STAT_TOOSHORT); return IPPROTO_DONE; } KASSERT(UDP_HDR_ALIGNED_P(uh)); @@ -538,7 +551,7 @@ udp6_input(struct mbuf **mp, int *offp, ulen = plen; if (plen != ulen) { - udp6stat.udp6s_badlen++; + UDP6_STATINC(UDP6_STAT_BADLEN); goto bad; } @@ -563,12 +576,12 @@ udp6_input(struct mbuf **mp, int *offp, /* * Construct source and dst sockaddrs. */ - bzero(&src, sizeof(src)); + memset(&src, 0, sizeof(src)); src.sin6_family = AF_INET6; src.sin6_len = sizeof(struct sockaddr_in6); src.sin6_addr = ip6->ip6_src; src.sin6_port = uh->uh_sport; - bzero(&dst, sizeof(dst)); + memset(&dst, 0, sizeof(dst)); dst.sin6_family = AF_INET6; dst.sin6_len = sizeof(struct sockaddr_in6); dst.sin6_addr = ip6->ip6_dst; @@ -576,10 +589,10 @@ udp6_input(struct mbuf **mp, int *offp, if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) { if (m->m_flags & M_MCAST) { - udp6stat.udp6s_noportmcast++; + UDP6_STATINC(UDP6_STAT_NOPORTMCAST); goto bad; } - udp6stat.udp6s_noport++; + UDP6_STATINC(UDP6_STAT_NOPORT); icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); m = NULL; } @@ -614,10 +627,10 @@ udp4_sendup(struct mbuf *m, int off /* o return; } -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec4_in_reject_so(m, so)) { - ipsecstat.in_polvio++; + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) icmp_error(n, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT, 0, 0); @@ -627,6 +640,9 @@ udp4_sendup(struct mbuf *m, int off /* o if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { if (inp && (inp->inp_flags & INP_CONTROLOPTS +#ifdef SO_OTIMESTAMP + || so->so_options & SO_OTIMESTAMP +#endif || so->so_options & SO_TIMESTAMP)) { struct ip *ip = mtod(n, struct ip *); ip_savecontrol(inp, &opts, ip, n); @@ -639,7 +655,7 @@ udp4_sendup(struct mbuf *m, int off /* o if (opts) m_freem(opts); so->so_rcv.sb_overflowed++; - udpstat[UDP_STAT_FULLSOCK]++; + UDP_STATINC(UDP_STAT_FULLSOCK); } else sorwakeup(so); } @@ -661,10 +677,10 @@ udp6_sendup(struct mbuf *m, int off /* o return; in6p = sotoin6pcb(so); -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec6_in_reject_so(m, so)) { - ipsec6stat.in_polvio++; + IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO); if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) icmp6_error(n, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN, 0); @@ -674,7 +690,10 @@ udp6_sendup(struct mbuf *m, int off /* o if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { if (in6p && (in6p->in6p_flags & IN6P_CONTROLOPTS - || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { +#ifdef SO_OTIMESTAMP + || in6p->in6p_socket->so_options & SO_OTIMESTAMP +#endif + || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *); ip6_savecontrol(in6p, &opts, ip6, n); } @@ -685,7 +704,7 @@ udp6_sendup(struct mbuf *m, int off /* o if (opts) m_freem(opts); so->so_rcv.sb_overflowed++; - udp6stat.udp6s_fullsock++; + UDP6_STATINC(UDP6_STAT_FULLSOCK); } else sorwakeup(so); } @@ -777,9 +796,10 @@ udp4_realinput(struct sockaddr_in *src, /* * Locate pcb for datagram. */ - inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, *dport); + inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, + *dport, 0); if (inp == 0) { - udpstat[UDP_STAT_PCBHASHMISS]++; + UDP_STATINC(UDP_STAT_PCBHASHMISS); inp = in_pcblookup_bind(&udbtable, *dst4, *dport); if (inp == 0) return rcvcnt; @@ -813,6 +833,12 @@ udp4_realinput(struct sockaddr_in *src, } #endif + /* + * Check the minimum TTL for socket. + */ + if (mtod(m, struct ip *)->ip_ttl < inp->inp_ip_minttl) + goto bad; + udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); rcvcnt++; } @@ -925,9 +951,9 @@ udp6_realinput(int af, struct sockaddr_i * Locate pcb for datagram. */ in6p = in6_pcblookup_connect(&udbtable, &src6, sport, dst6, - dport, 0); + dport, 0, 0); if (in6p == 0) { - udpstat[UDP_STAT_PCBHASHMISS]++; + UDP_STATINC(UDP_STAT_PCBHASHMISS); in6p = in6_pcblookup_bind(&udbtable, dst6, dport, 0); if (in6p == 0) return rcvcnt; @@ -988,14 +1014,13 @@ udp_ctlinput(int cmd, const struct socka } int -udp_ctloutput(int op, struct socket *so, int level, int optname, - struct mbuf **mp) +udp_ctloutput(int op, struct socket *so, struct sockopt *sopt) { int s; int error = 0; - struct mbuf *m; struct inpcb *inp; int family; + int optval; family = so->so_proto->pr_domain->dom_family; @@ -1003,16 +1028,16 @@ udp_ctloutput(int op, struct socket *so, switch (family) { #ifdef INET case PF_INET: - if (level != IPPROTO_UDP) { - error = ip_ctloutput(op, so, level, optname, mp); + if (sopt->sopt_level != IPPROTO_UDP) { + error = ip_ctloutput(op, so, sopt); goto end; } break; #endif #ifdef INET6 case PF_INET6: - if (level != IPPROTO_UDP) { - error = ip6_ctloutput(op, so, level, optname, mp); + if (sopt->sopt_level != IPPROTO_UDP) { + error = ip6_ctloutput(op, so, sopt); goto end; } break; @@ -1025,17 +1050,15 @@ udp_ctloutput(int op, struct socket *so, switch (op) { case PRCO_SETOPT: - m = *mp; inp = sotoinpcb(so); - switch (optname) { + switch (sopt->sopt_name) { case UDP_ENCAP: - if (m == NULL || m->m_len != sizeof(int)) { - error = EINVAL; + error = sockopt_getint(sopt, &optval); + if (error) break; - } - switch(*mtod(m, int *)) { + switch(optval) { #ifdef IPSEC_NAT_T case 0: inp->inp_flags &= ~INP_ESPINUDP_ALL; @@ -1056,14 +1079,20 @@ udp_ctloutput(int op, struct socket *so, break; } break; + + case UDP_RFC6056ALGO: + error = sockopt_getint(sopt, &optval); + if (error) + break; + + error = rfc6056_algo_index_select( + (struct inpcb_hdr *)inp, optval); + break; default: error = ENOPROTOOPT; break; } - if (m != NULL) { - m_free(m); - } break; default: @@ -1143,7 +1172,7 @@ udp_output(struct mbuf *m, ...) ((struct ip *)ui)->ip_len = htons(sizeof (struct udpiphdr) + len); ((struct ip *)ui)->ip_ttl = inp->inp_ip.ip_ttl; /* XXX */ ((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos; /* XXX */ - udpstat[UDP_STAT_OPACKETS]++; + UDP_STATINC(UDP_STAT_OPACKETS); return (ip_output(m, inp->inp_options, ro, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST), @@ -1174,9 +1203,11 @@ udp_usrreq(struct socket *so, int req, s s = splsoftnet(); if (req == PRU_PURGEIF) { + mutex_enter(softnet_lock); in_pcbpurgeif0(&udbtable, (struct ifnet *)control); in_purgeif((struct ifnet *)control); in_pcbpurgeif(&udbtable, (struct ifnet *)control); + mutex_exit(softnet_lock); splx(s); return (0); } @@ -1186,7 +1217,9 @@ udp_usrreq(struct socket *so, int req, s if (req != PRU_SEND && req != PRU_SENDOOB && control) panic("udp_usrreq: unexpected control mbuf"); #endif - if (inp == 0 && req != PRU_ATTACH) { + if (req == PRU_ATTACH) { + sosetlock(so); + } else if (inp == 0) { error = EINVAL; goto release; } @@ -1268,6 +1301,7 @@ udp_usrreq(struct socket *so, int req, s { struct in_addr laddr; /* XXX */ + memset(&laddr, 0, sizeof laddr); if (nam) { laddr = inp->inp_laddr; /* XXX */ if ((so->so_state & SS_ISCONNECTED) != 0) { @@ -1330,12 +1364,21 @@ release: return (error); } +static int +sysctl_net_inet_udp_stats(SYSCTLFN_ARGS) +{ + + return (NETSTAT_SYSCTL(udpstat_percpu, UDP_NSTATS)); +} + /* * Sysctl for udp variables. */ -SYSCTL_SETUP(sysctl_net_inet_udp_setup, "sysctl net.inet.udp subtree setup") +static void +sysctl_net_inet_udp_setup(struct sysctllog **clog) { - + const struct sysctlnode *rfc6056_node; + sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, CTLTYPE_NODE, "net", NULL, @@ -1392,12 +1435,39 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, CTLFLAG_PERMANENT, CTLTYPE_STRUCT, "stats", SYSCTL_DESCR("UDP statistics"), - NULL, 0, udpstat, sizeof(udpstat), + sysctl_net_inet_udp_stats, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS, CTL_EOL); + /* RFC6056 subtree */ + sysctl_createv(clog, 0, NULL, &rfc6056_node, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "rfc6056", + SYSCTL_DESCR("RFC 6056"), + NULL, 0, NULL, 0, + CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE, CTL_EOL); + sysctl_createv(clog, 0, &rfc6056_node, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, "available", + SYSCTL_DESCR("RFC 6056 available algorithms"), + sysctl_rfc6056_available, 0, NULL, RFC6056_MAXLEN, + CTL_CREATE, CTL_EOL); + sysctl_createv(clog, 0, &rfc6056_node, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_STRING, "selected", + SYSCTL_DESCR("RFC 6056 selected algorithm"), + sysctl_rfc6056_selected, 0, NULL, RFC6056_MAXLEN, + CTL_CREATE, CTL_EOL); } #endif +void +udp_statinc(u_int stat) +{ + + KASSERT(stat < UDP_NSTATS); + UDP_STATINC(stat); +} + #if (defined INET && defined IPSEC_NAT_T) /* * Returns: @@ -1534,7 +1604,7 @@ udp4_espinudp(struct mbuf **mp, int off, esp4_input(n, iphdrlen); #endif - /* We handled it, it shoudln't be handled by UDP */ + /* We handled it, it shouldn't be handled by UDP */ return 1; } #endif