X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..d1ecb069dfe24481e4a83f44cb5217a2b06746d7:/bsd/netinet6/raw_ip6.c diff --git a/bsd/netinet6/raw_ip6.c b/bsd/netinet6/raw_ip6.c index e84171ae6..79eda381e 100644 --- a/bsd/netinet6/raw_ip6.c +++ b/bsd/netinet6/raw_ip6.c @@ -1,3 +1,30 @@ +/* + * Copyright (c) 2009 Apple Inc. All rights reserved. + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. + * + * The Original Code and all software distributed under the License are + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ + */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -109,9 +136,8 @@ extern int ipsec_bypass; extern struct inpcbhead ripcb; extern struct inpcbinfo ripcbinfo; -extern u_long rip_sendspace; -extern u_long rip_recvspace; -extern u_long route_generation; +extern u_int32_t rip_sendspace; +extern u_int32_t rip_recvspace; struct rip6stat rip6stat; @@ -330,6 +356,10 @@ rip6_output( } M_PREPEND(m, sizeof(*ip6), M_WAIT); + if (m == NULL) { + error = ENOBUFS; + goto bad; + } ip6 = mtod(m, struct ip6_hdr *); /* @@ -350,6 +380,7 @@ rip6_output( * XXX Boundary check is assumed to be already done in * ip6_setpktoptions(). */ + ifnet_head_lock_shared(); if (optp && (pi = optp->ip6po_pktinfo) && pi->ipi6_ifindex) { ip6->ip6_dst.s6_addr16[1] = htons(pi->ipi6_ifindex); oifp = ifindex2ifnet[pi->ipi6_ifindex]; @@ -359,15 +390,21 @@ rip6_output( oifp = in6p->in6p_moptions->im6o_multicast_ifp; ip6->ip6_dst.s6_addr16[1] = htons(oifp->if_index); } else if (dstsock->sin6_scope_id) { - /* boundary check */ - if (dstsock->sin6_scope_id < 0 - || if_index < dstsock->sin6_scope_id) { + /* + * boundary check + * + * Sinced stsock->sin6_scope_id is unsigned, we don't + * need to check if it's < 0 + */ + if (if_index < dstsock->sin6_scope_id) { error = ENXIO; /* XXX EINVAL? */ + ifnet_head_done(); goto bad; } ip6->ip6_dst.s6_addr16[1] = htons(dstsock->sin6_scope_id & 0xffff);/*XXX*/ } + ifnet_head_done(); } /* @@ -376,7 +413,7 @@ rip6_output( { struct in6_addr *in6a; struct in6_addr storage; - + u_short index = 0; if ((in6a = in6_selectsrc(dstsock, optp, in6p->in6p_moptions, &in6p->in6p_route, @@ -387,8 +424,18 @@ rip6_output( goto bad; } ip6->ip6_src = *in6a; - if (in6p->in6p_route.ro_rt) - oifp = ifindex2ifnet[in6p->in6p_route.ro_rt->rt_ifp->if_index]; + if (in6p->in6p_route.ro_rt != NULL) { + RT_LOCK(in6p->in6p_route.ro_rt); + if (in6p->in6p_route.ro_rt->rt_ifp != NULL) + index = in6p->in6p_route.ro_rt->rt_ifp->if_index; + RT_UNLOCK(in6p->in6p_route.ro_rt); + ifnet_head_lock_shared(); + if (index == 0 || if_index < index) { + panic("bad if_index on interface from route"); + } + oifp = ifindex2ifnet[index]; + ifnet_head_done(); + } } ip6->ip6_flow = (ip6->ip6_flow & ~IPV6_FLOWINFO_MASK) | (in6p->in6p_flowinfo & IPV6_FLOWINFO_MASK); @@ -434,13 +481,34 @@ rip6_output( } #endif /*IPSEC*/ - if (in6p->in6p_route.ro_rt && in6p->in6p_route.ro_rt->generation_id != route_generation) { + if (in6p->in6p_route.ro_rt != NULL && + in6p->in6p_route.ro_rt->generation_id != route_generation) { rtfree(in6p->in6p_route.ro_rt); - in6p->in6p_route.ro_rt = (struct rtentry *)0; + in6p->in6p_route.ro_rt = NULL; } +#if PKT_PRIORITY + if (soisbackground(so)) + m_prio_background(m); +#endif /* PKT_PRIORITY */ + error = ip6_output(m, optp, &in6p->in6p_route, 0, in6p->in6p_moptions, &oifp, 0); + +#if IFNET_ROUTE_REFCNT + /* + * Always discard the cached route for unconnected socket + * or if it is a multicast route. + */ + if (in6p->in6p_route.ro_rt != NULL && + ((in6p->in6p_route.ro_rt->rt_flags & RTF_MULTICAST) || + in6p->in6p_socket == NULL || + in6p->in6p_socket->so_state != SS_ISCONNECTED)) { + rtfree(in6p->in6p_route.ro_rt); + in6p->in6p_route.ro_rt = NULL; + } +#endif /* IFNET_ROUTE_REFCNT */ + if (so->so_proto->pr_protocol == IPPROTO_ICMPV6) { if (oifp) icmp6_ifoutstat_inc(oifp, type, code); @@ -467,11 +535,13 @@ rip6_output( return(error); } +#if IPFW2 static void load_ip6fw(void) { ip6_fw_init(); } +#endif /* * Raw IPv6 socket option processing. @@ -497,6 +567,7 @@ rip6_ctloutput( switch (sopt->sopt_dir) { case SOPT_GET: switch (sopt->sopt_name) { +#if IPFW2 case IPV6_FW_ADD: case IPV6_FW_GET: if (ip6_fw_ctl_ptr == 0) @@ -506,6 +577,7 @@ rip6_ctloutput( else error = ENOPROTOOPT; break; +#endif case MRT6_INIT: case MRT6_DONE: @@ -514,8 +586,10 @@ rip6_ctloutput( case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: +#if MROUTING error = ip6_mrouter_get(so, sopt); break; +#endif default: error = ip6_ctloutput(so, sopt); break; @@ -524,6 +598,7 @@ rip6_ctloutput( case SOPT_SET: switch (sopt->sopt_name) { +#if IPFW2 case IPV6_FW_ADD: case IPV6_FW_DEL: case IPV6_FW_FLUSH: @@ -535,6 +610,7 @@ rip6_ctloutput( else error = ENOPROTOOPT; break; +#endif case MRT6_INIT: case MRT6_DONE: @@ -543,8 +619,10 @@ rip6_ctloutput( case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: +#if MROUTING error = ip6_mrouter_set(so, sopt); break; +#endif default: error = ip6_ctloutput(so, sopt); break; @@ -556,7 +634,7 @@ rip6_ctloutput( } static int -rip6_attach(struct socket *so, int proto, __unused struct proc *p) +rip6_attach(struct socket *so, int proto, struct proc *p) { struct inpcb *inp; int error; @@ -564,7 +642,7 @@ rip6_attach(struct socket *so, int proto, __unused struct proc *p) inp = sotoinpcb(so); if (inp) panic("rip6_attach"); - if (p && (error = proc_suser(p)) != 0) + if ((error = proc_suser(p)) != 0) return error; error = soreserve(so, rip_sendspace, rip_recvspace); @@ -575,7 +653,7 @@ rip6_attach(struct socket *so, int proto, __unused struct proc *p) return error; inp = (struct inpcb *)so->so_pcb; inp->inp_vflag |= INP_IPV6; - inp->in6p_ip6_nxt = (long)proto; + inp->in6p_ip6_nxt = (char)proto; inp->in6p_hops = -1; /* use kernel default */ inp->in6p_cksum = -1; MALLOC(inp->in6p_icmp6filt, struct icmp6_filter *, @@ -595,8 +673,10 @@ rip6_detach(struct socket *so) if (inp == 0) panic("rip6_detach"); /* xxx: RSVP */ +#if MROUTING if (so == ip6_mrouter) ip6_mrouter_done(); +#endif if (inp->in6p_icmp6filt) { FREE(inp->in6p_icmp6filt, M_PCB); inp->in6p_icmp6filt = NULL;