X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2dced7af2b695f87fe26496a3e73c219b7880cbc..HEAD:/bsd/netinet6/ip6_input.c diff --git a/bsd/netinet6/ip6_input.c b/bsd/netinet6/ip6_input.c index 12692628e..e1b9091a5 100644 --- a/bsd/netinet6/ip6_input.c +++ b/bsd/netinet6/ip6_input.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2015 Apple Inc. All rights reserved. + * Copyright (c) 2003-2020 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -131,6 +131,7 @@ #endif /* INET */ #include #include +#include #include #include #include @@ -146,12 +147,7 @@ extern int ipsec_bypass; #endif /* IPSEC */ -#if IPFW2 -#include -#endif /* IPFW2 */ - #if DUMMYNET -#include #include #endif /* DUMMYNET */ @@ -162,45 +158,47 @@ extern int ipsec_bypass; #include #endif /* PF */ +#include + struct ip6protosw *ip6_protox[IPPROTO_MAX]; -static lck_grp_attr_t *in6_ifaddr_rwlock_grp_attr; -static lck_grp_t *in6_ifaddr_rwlock_grp; -static lck_attr_t *in6_ifaddr_rwlock_attr; +static lck_grp_attr_t *in6_ifaddr_rwlock_grp_attr; +static lck_grp_t *in6_ifaddr_rwlock_grp; +static lck_attr_t *in6_ifaddr_rwlock_attr; decl_lck_rw_data(, in6_ifaddr_rwlock); /* Protected by in6_ifaddr_rwlock */ -struct in6_ifaddr *in6_ifaddrs = NULL; +struct in6_ifaddrhead in6_ifaddrhead; +struct in6_ifaddrhashhead * in6_ifaddrhashtbl; +uint32_t in6_ifaddrhmask; + +#define IN6ADDR_NHASH 61 +u_int32_t in6addr_nhash = 0; /* hash table size */ +u_int32_t in6addr_hashp = 0; /* next largest prime */ -#define IN6_IFSTAT_REQUIRE_ALIGNED_64(f) \ + +#define IN6_IFSTAT_REQUIRE_ALIGNED_64(f) \ _CASSERT(!(offsetof(struct in6_ifstat, f) % sizeof (uint64_t))) -#define ICMP6_IFSTAT_REQUIRE_ALIGNED_64(f) \ +#define ICMP6_IFSTAT_REQUIRE_ALIGNED_64(f) \ _CASSERT(!(offsetof(struct icmp6_ifstat, f) % sizeof (uint64_t))) -#if IPFW2 -/* firewall hooks */ -ip6_fw_chk_t *ip6_fw_chk_ptr; -ip6_fw_ctl_t *ip6_fw_ctl_ptr; -int ip6_fw_enable = 1; -#endif /* IPFW2 */ - struct ip6stat ip6stat; decl_lck_mtx_data(, proxy6_lock); decl_lck_mtx_data(static, dad6_mutex_data); decl_lck_mtx_data(static, nd6_mutex_data); decl_lck_mtx_data(static, prefix6_mutex_data); -lck_mtx_t *dad6_mutex = &dad6_mutex_data; -lck_mtx_t *nd6_mutex = &nd6_mutex_data; -lck_mtx_t *prefix6_mutex = &prefix6_mutex_data; +lck_mtx_t *dad6_mutex = &dad6_mutex_data; +lck_mtx_t *nd6_mutex = &nd6_mutex_data; +lck_mtx_t *prefix6_mutex = &prefix6_mutex_data; #ifdef ENABLE_ADDRSEL decl_lck_mtx_data(static, addrsel_mutex_data); -lck_mtx_t *addrsel_mutex = &addrsel_mutex_data; +lck_mtx_t *addrsel_mutex = &addrsel_mutex_data; #endif -static lck_attr_t *ip6_mutex_attr; -static lck_grp_t *ip6_mutex_grp; -static lck_grp_attr_t *ip6_mutex_grp_attr; +static lck_attr_t *ip6_mutex_attr; +static lck_grp_t *ip6_mutex_grp; +static lck_grp_attr_t *ip6_mutex_grp_attr; extern int loopattach_done; extern void addrsel_policy_init(void); @@ -211,38 +209,95 @@ static int sysctl_ip6_input_getperf SYSCTL_HANDLER_ARGS; static void ip6_init_delayed(void); static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); +static void in6_ifaddrhashtbl_init(void); + #if NSTF extern void stfattach(void); #endif /* NSTF */ SYSCTL_DECL(_net_inet6_ip6); -int ip6_doscopedroute = 1; -SYSCTL_INT(_net_inet6_ip6, OID_AUTO, scopedroute, - CTLFLAG_RD | CTLFLAG_LOCKED, &ip6_doscopedroute, 0, - "Enable IPv6 scoped routing"); - static uint32_t ip6_adj_clear_hwcksum = 0; SYSCTL_UINT(_net_inet6_ip6, OID_AUTO, adj_clear_hwcksum, - CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_adj_clear_hwcksum, 0, - "Invalidate hwcksum info when adjusting length"); + CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_adj_clear_hwcksum, 0, + "Invalidate hwcksum info when adjusting length"); + +static uint32_t ip6_adj_partial_sum = 1; +SYSCTL_UINT(_net_inet6_ip6, OID_AUTO, adj_partial_sum, + CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_adj_partial_sum, 0, + "Perform partial sum adjustment of trailing bytes at IP layer"); static int ip6_input_measure = 0; SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, input_perf, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, - &ip6_input_measure, 0, sysctl_reset_ip6_input_stats, "I", "Do time measurement"); + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, + &ip6_input_measure, 0, sysctl_reset_ip6_input_stats, "I", "Do time measurement"); static uint64_t ip6_input_measure_bins = 0; SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, input_perf_bins, - CTLTYPE_QUAD | CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_input_measure_bins, 0, - sysctl_ip6_input_measure_bins, "I", - "bins for chaining performance data histogram"); + CTLTYPE_QUAD | CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_input_measure_bins, 0, + sysctl_ip6_input_measure_bins, "I", + "bins for chaining performance data histogram"); static net_perf_t net_perf; SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, input_perf_data, - CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED, - 0, 0, sysctl_ip6_input_getperf, "S,net_perf", - "IP6 input performance data (struct net_perf, net/net_perf.h)"); + CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED, + 0, 0, sysctl_ip6_input_getperf, "S,net_perf", + "IP6 input performance data (struct net_perf, net/net_perf.h)"); + +/* + * ip6_checkinterface controls the receive side of the models for multihoming + * that are discussed in RFC 1122. + * + * sysctl_ip6_checkinterface values are: + * IP6_CHECKINTERFACE_WEAK_ES: + * This corresponds to the Weak End-System model where incoming packets from + * any interface are accepted provided the destination address of the incoming packet + * is assigned to some interface. + * + * IP6_CHECKINTERFACE_HYBRID_ES: + * The Hybrid End-System model use the Strong End-System for tunnel interfaces + * (ipsec and utun) and the weak End-System model for other interfaces families. + * This prevents a rogue middle box to probe for signs of TCP connections + * that use the tunnel interface. + * + * IP6_CHECKINTERFACE_STRONG_ES: + * The Strong model model requires the packet arrived on an interface that + * is assigned the destination address of the packet. + * + * Since the routing table and transmit implementation do not implement the Strong ES model, + * setting this to a value different from IP6_CHECKINTERFACE_WEAK_ES may lead to unexpected results. + * + * When forwarding is enabled, the system reverts to the Weak ES model as a router + * is expected by design to receive packets from several interfaces to the same address. + */ +#define IP6_CHECKINTERFACE_WEAK_ES 0 +#define IP6_CHECKINTERFACE_HYBRID_ES 1 +#define IP6_CHECKINTERFACE_STRONG_ES 2 + +static int ip6_checkinterface = IP6_CHECKINTERFACE_HYBRID_ES; + +static int sysctl_ip6_checkinterface SYSCTL_HANDLER_ARGS; +SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, check_interface, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, + 0, 0, sysctl_ip6_checkinterface, "I", "Verify packet arrives on correct interface"); + +#if (DEBUG || DEVELOPMENT) +#define IP6_CHECK_IFDEBUG 1 +#else +#define IP6_CHECK_IFDEBUG 0 +#endif /* (DEBUG || DEVELOPMENT) */ +static int ip6_checkinterface_debug = IP6_CHECK_IFDEBUG; +SYSCTL_INT(_net_inet6_ip6, OID_AUTO, checkinterface_debug, CTLFLAG_RW | CTLFLAG_LOCKED, + &ip6_checkinterface_debug, IP6_CHECK_IFDEBUG, ""); + +typedef enum ip6_check_if_result { + IP6_CHECK_IF_NONE = 0, + IP6_CHECK_IF_OURS = 1, + IP6_CHECK_IF_DROP = 2, + IP6_CHECK_IF_FORWARD = 3 +} ip6_check_if_result_t; + +static ip6_check_if_result_t ip6_input_check_interface(struct mbuf *, struct ip6_hdr *, struct ifnet *, struct route_in6 *rin6, struct ifnet **); /* * On platforms which require strict alignment (currently for anything but @@ -256,27 +311,27 @@ SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, input_perf_data, * load/store operations on the fields in IPv6 headers. */ #if defined(__i386__) || defined(__x86_64__) -#define IP6_HDR_ALIGNMENT_FIXUP(_m, _ifp, _action) do { } while (0) +#define IP6_HDR_ALIGNMENT_FIXUP(_m, _ifp, _action) do { } while (0) #else /* !__i386__ && !__x86_64__ */ -#define IP6_HDR_ALIGNMENT_FIXUP(_m, _ifp, _action) do { \ - if (!IP6_HDR_ALIGNED_P(mtod(_m, caddr_t))) { \ - struct mbuf *_n; \ - struct ifnet *__ifp = (_ifp); \ - atomic_add_64(&(__ifp)->if_alignerrs, 1); \ - if (((_m)->m_flags & M_PKTHDR) && \ - (_m)->m_pkthdr.pkt_hdr != NULL) \ - (_m)->m_pkthdr.pkt_hdr = NULL; \ - _n = m_defrag_offset(_m, max_linkhdr, M_NOWAIT); \ - if (_n == NULL) { \ - ip6stat.ip6s_toosmall++; \ - m_freem(_m); \ - (_m) = NULL; \ - _action; \ - } else { \ - VERIFY(_n != (_m)); \ - (_m) = _n; \ - } \ - } \ +#define IP6_HDR_ALIGNMENT_FIXUP(_m, _ifp, _action) do { \ + if (!IP6_HDR_ALIGNED_P(mtod(_m, caddr_t))) { \ + struct mbuf *_n; \ + struct ifnet *__ifp = (_ifp); \ + atomic_add_64(&(__ifp)->if_alignerrs, 1); \ + if (((_m)->m_flags & M_PKTHDR) && \ + (_m)->m_pkthdr.pkt_hdr != NULL) \ + (_m)->m_pkthdr.pkt_hdr = NULL; \ + _n = m_defrag_offset(_m, max_linkhdr, M_NOWAIT); \ + if (_n == NULL) { \ + ip6stat.ip6s_toosmall++; \ + m_freem(_m); \ + (_m) = NULL; \ + _action; \ + } else { \ + VERIFY(_n != (_m)); \ + (_m) = _n; \ + } \ + } \ } while (0) #endif /* !__i386__ && !__x86_64__ */ @@ -286,8 +341,9 @@ ip6_proto_input(protocol_family_t protocol, mbuf_t packet) #pragma unused(protocol) #if INET struct timeval start_tv; - if (ip6_input_measure) + if (ip6_input_measure) { net_perf_start_time(&net_perf, &start_tv); + } #endif /* INET */ ip6_input(packet); #if INET @@ -312,17 +368,29 @@ ip6_init(struct ip6protosw *pp, struct domain *dp) domain_unguard_t unguard; domain_proto_mtx_lock_assert_held(); - VERIFY((pp->pr_flags & (PR_INITIALIZED|PR_ATTACHED)) == PR_ATTACHED); + VERIFY((pp->pr_flags & (PR_INITIALIZED | PR_ATTACHED)) == PR_ATTACHED); - _CASSERT((sizeof (struct ip6_hdr) + - sizeof (struct icmp6_hdr)) <= _MHLEN); + _CASSERT((sizeof(struct ip6_hdr) + + sizeof(struct icmp6_hdr)) <= _MHLEN); - if (ip6_initialized) + if (ip6_initialized) { return; + } ip6_initialized = 1; - PE_parse_boot_argn("net.inet6.ip6.scopedroute", &ip6_doscopedroute, - sizeof (ip6_doscopedroute)); + eventhandler_lists_ctxt_init(&in6_evhdlr_ctxt); + (void)EVENTHANDLER_REGISTER(&in6_evhdlr_ctxt, in6_event, + in6_eventhdlr_callback, eventhandler_entry_dummy_arg, + EVENTHANDLER_PRI_ANY); + + eventhandler_lists_ctxt_init(&in6_clat46_evhdlr_ctxt); + (void)EVENTHANDLER_REGISTER(&in6_clat46_evhdlr_ctxt, in6_clat46_event, + in6_clat46_eventhdlr_callback, eventhandler_entry_dummy_arg, + EVENTHANDLER_PRI_ANY); + + for (i = 0; i < IN6_EVENT_MAX; i++) { + VERIFY(in6_event2kev_array[i].in6_event_code == i); + } pr = pffindproto_locked(PF_INET6, IPPROTO_RAW, SOCK_RAW); if (pr == NULL) { @@ -332,8 +400,9 @@ ip6_init(struct ip6protosw *pp, struct domain *dp) } /* Initialize the entire ip6_protox[] array to IPPROTO_RAW. */ - for (i = 0; i < IPPROTO_MAX; i++) + for (i = 0; i < IPPROTO_MAX; i++) { ip6_protox[i] = (struct ip6protosw *)pr; + } /* * Cycle through IP protocols and put them into the appropriate place * in ip6_protox[], skipping protocols IPPROTO_{IP,RAW}. @@ -343,9 +412,10 @@ ip6_init(struct ip6protosw *pp, struct domain *dp) VERIFY(pr->pr_domain == dp); if (pr->pr_protocol != 0 && pr->pr_protocol != IPPROTO_RAW) { /* Be careful to only index valid IP protocols. */ - if (pr->pr_protocol < IPPROTO_MAX) + if (pr->pr_protocol < IPPROTO_MAX) { ip6_protox[pr->pr_protocol] = (struct ip6protosw *)pr; + } } } @@ -372,6 +442,9 @@ ip6_init(struct ip6protosw *pp, struct domain *dp) lck_rw_init(&in6_ifaddr_rwlock, in6_ifaddr_rwlock_grp, in6_ifaddr_rwlock_attr); + TAILQ_INIT(&in6_ifaddrhead); + in6_ifaddrhashtbl_init(); + IN6_IFSTAT_REQUIRE_ALIGNED_64(ifs6_in_receive); IN6_IFSTAT_REQUIRE_ALIGNED_64(ifs6_in_hdrerr); IN6_IFSTAT_REQUIRE_ALIGNED_64(ifs6_in_toobig); @@ -433,6 +506,17 @@ ip6_init(struct ip6protosw *pp, struct domain *dp) ip6_desync_factor = (RandomULong() ^ tv.tv_usec) % MAX_TEMP_DESYNC_FACTOR; + PE_parse_boot_argn("ip6_checkinterface", &i, sizeof(i)); + switch (i) { + case IP6_CHECKINTERFACE_WEAK_ES: + case IP6_CHECKINTERFACE_HYBRID_ES: + case IP6_CHECKINTERFACE_STRONG_ES: + ip6_checkinterface = i; + break; + default: + break; + } + in6_ifaddr_init(); ip6_moptions_init(); nd6_init(); @@ -472,33 +556,259 @@ ip6_init_delayed(void) #endif /* NSTF */ } +static void +ip6_input_adjust(struct mbuf *m, struct ip6_hdr *ip6, uint32_t plen, + struct ifnet *inifp) +{ + boolean_t adjust = TRUE; + uint32_t tot_len = sizeof(*ip6) + plen; + + ASSERT(m_pktlen(m) > tot_len); + + /* + * Invalidate hardware checksum info if ip6_adj_clear_hwcksum + * is set; useful to handle buggy drivers. Note that this + * should not be enabled by default, as we may get here due + * to link-layer padding. + */ + if (ip6_adj_clear_hwcksum && + (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) && + !(inifp->if_flags & IFF_LOOPBACK) && + !(m->m_pkthdr.pkt_flags & PKTF_LOOP)) { + m->m_pkthdr.csum_flags &= ~CSUM_DATA_VALID; + m->m_pkthdr.csum_data = 0; + ip6stat.ip6s_adj_hwcsum_clr++; + } + + /* + * If partial checksum information is available, subtract + * out the partial sum of postpended extraneous bytes, and + * update the checksum metadata accordingly. By doing it + * here, the upper layer transport only needs to adjust any + * prepended extraneous bytes (else it will do both.) + */ + if (ip6_adj_partial_sum && + (m->m_pkthdr.csum_flags & (CSUM_DATA_VALID | CSUM_PARTIAL)) == + (CSUM_DATA_VALID | CSUM_PARTIAL)) { + m->m_pkthdr.csum_rx_val = m_adj_sum16(m, + m->m_pkthdr.csum_rx_start, m->m_pkthdr.csum_rx_start, + (tot_len - m->m_pkthdr.csum_rx_start), + m->m_pkthdr.csum_rx_val); + } else if ((m->m_pkthdr.csum_flags & + (CSUM_DATA_VALID | CSUM_PARTIAL)) == + (CSUM_DATA_VALID | CSUM_PARTIAL)) { + /* + * If packet has partial checksum info and we decided not + * to subtract the partial sum of postpended extraneous + * bytes here (not the default case), leave that work to + * be handled by the other layers. For now, only TCP, UDP + * layers are capable of dealing with this. For all other + * protocols (including fragments), trim and ditch the + * partial sum as those layers might not implement partial + * checksumming (or adjustment) at all. + */ + if (ip6->ip6_nxt == IPPROTO_TCP || + ip6->ip6_nxt == IPPROTO_UDP) { + adjust = FALSE; + } else { + m->m_pkthdr.csum_flags &= ~CSUM_DATA_VALID; + m->m_pkthdr.csum_data = 0; + ip6stat.ip6s_adj_hwcsum_clr++; + } + } + + if (adjust) { + ip6stat.ip6s_adj++; + if (m->m_len == m->m_pkthdr.len) { + m->m_len = tot_len; + m->m_pkthdr.len = tot_len; + } else { + m_adj(m, tot_len - m->m_pkthdr.len); + } + } +} +static ip6_check_if_result_t +ip6_input_check_interface(struct mbuf *m, struct ip6_hdr *ip6, struct ifnet *inifp, struct route_in6 *rin6, struct ifnet **deliverifp) +{ + struct in6_ifaddr *ia6 = NULL; + struct in6_addr tmp_dst = ip6->ip6_dst; /* copy to avoid unaligned access */ + struct in6_ifaddr *best_ia6 = NULL; + ip6_check_if_result_t result = IP6_CHECK_IF_NONE; + + *deliverifp = NULL; + + /* + * Check for exact addresses in the hash bucket. + */ + lck_rw_lock_shared(&in6_ifaddr_rwlock); + TAILQ_FOREACH(ia6, IN6ADDR_HASH(&tmp_dst), ia6_hash) { + /* + * TODO: should we accept loopbacl + */ + if (IN6_ARE_ADDR_EQUAL(&ia6->ia_addr.sin6_addr, &tmp_dst)) { + if ((ia6->ia6_flags & (IN6_IFF_NOTREADY | IN6_IFF_CLAT46))) { + continue; + } + best_ia6 = ia6; + if (ia6->ia_ifp == inifp) { + /* + * TODO: should we also accept locally originated packets + * or from loopback ??? + */ + break; + } + /* + * Continue the loop in case there's a exact match with another + * interface + */ + } + } + if (best_ia6 != NULL) { + if (best_ia6->ia_ifp != inifp && ip6_forwarding == 0 && + ((ip6_checkinterface == IP6_CHECKINTERFACE_HYBRID_ES && + (best_ia6->ia_ifp->if_family == IFNET_FAMILY_IPSEC || + best_ia6->ia_ifp->if_family == IFNET_FAMILY_UTUN)) || + ip6_checkinterface == IP6_CHECKINTERFACE_STRONG_ES)) { + /* + * Drop when interface address check is strict and forwarding + * is disabled + */ + result = IP6_CHECK_IF_DROP; + } else { + result = IP6_CHECK_IF_OURS; + *deliverifp = best_ia6->ia_ifp; + ip6_setdstifaddr_info(m, 0, best_ia6); + } + } + lck_rw_done(&in6_ifaddr_rwlock); + + if (result == IP6_CHECK_IF_NONE) { + /* + * Slow path: route lookup. + */ + struct sockaddr_in6 *dst6; + + dst6 = SIN6(&rin6->ro_dst); + dst6->sin6_len = sizeof(struct sockaddr_in6); + dst6->sin6_family = AF_INET6; + dst6->sin6_addr = ip6->ip6_dst; + + rtalloc_scoped_ign((struct route *)rin6, + RTF_PRCLONING, IFSCOPE_NONE); + if (rin6->ro_rt != NULL) { + RT_LOCK_SPIN(rin6->ro_rt); + } + +#define rt6_key(r) (SIN6((r)->rt_nodes->rn_key)) + + /* + * Accept the packet if the forwarding interface to the destination + * according to the routing table is the loopback interface, + * unless the associated route has a gateway. + * Note that this approach causes to accept a packet if there is a + * route to the loopback interface for the destination of the packet. + * But we think it's even useful in some situations, e.g. when using + * a special daemon which wants to intercept the packet. + * + * XXX: some OSes automatically make a cloned route for the destination + * of an outgoing packet. If the outgoing interface of the packet + * is a loopback one, the kernel would consider the packet to be + * accepted, even if we have no such address assinged on the interface. + * We check the cloned flag of the route entry to reject such cases, + * assuming that route entries for our own addresses are not made by + * cloning (it should be true because in6_addloop explicitly installs + * the host route). However, we might have to do an explicit check + * while it would be less efficient. Or, should we rather install a + * reject route for such a case? + */ + if (rin6->ro_rt != NULL && + (rin6->ro_rt->rt_flags & (RTF_HOST | RTF_GATEWAY)) == RTF_HOST && +#if RTF_WASCLONED + !(rin6->ro_rt->rt_flags & RTF_WASCLONED) && +#endif + rin6->ro_rt->rt_ifp->if_type == IFT_LOOP) { + ia6 = (struct in6_ifaddr *)rin6->ro_rt->rt_ifa; + /* + * Packets to a tentative, duplicated, or somehow invalid + * address must not be accepted. + * + * For performance, test without acquiring the address lock; + * a lot of things in the address are set once and never + * changed (e.g. ia_ifp.) + */ + if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) { + /* this address is ready */ + result = IP6_CHECK_IF_OURS; + *deliverifp = ia6->ia_ifp; /* correct? */ + /* + * record dst address information into mbuf. + */ + (void) ip6_setdstifaddr_info(m, 0, ia6); + } + } + + if (rin6->ro_rt != NULL) { + RT_UNLOCK(rin6->ro_rt); + } + } + + if (result == IP6_CHECK_IF_NONE) { + if (ip6_forwarding == 0) { + result = IP6_CHECK_IF_DROP; + } else { + result = IP6_CHECK_IF_FORWARD; + ip6_setdstifaddr_info(m, inifp->if_index, NULL); + } + } + + if (result == IP6_CHECK_IF_OURS && *deliverifp != inifp) { + ASSERT(*deliverifp != NULL); + ip6stat.ip6s_rcv_if_weak_match++; + + /* Logging is too noisy when forwarding is enabled */ + if (ip6_checkinterface_debug != IP6_CHECKINTERFACE_WEAK_ES && ip6_forwarding != 0) { + char src_str[MAX_IPv6_STR_LEN]; + char dst_str[MAX_IPv6_STR_LEN]; + + inet_ntop(AF_INET6, &ip6->ip6_src, src_str, sizeof(src_str)); + inet_ntop(AF_INET6, &ip6->ip6_dst, dst_str, sizeof(dst_str)); + os_log_info(OS_LOG_DEFAULT, + "%s: weak ES interface match to %s for packet from %s to %s proto %u received via %s", + __func__, (*deliverifp)->if_xname, src_str, dst_str, ip6->ip6_nxt, inifp->if_xname); + } + } else if (result == IP6_CHECK_IF_DROP) { + ip6stat.ip6s_rcv_if_no_match++; + if (ip6_checkinterface_debug > 0) { + char src_str[MAX_IPv6_STR_LEN]; + char dst_str[MAX_IPv6_STR_LEN]; + + inet_ntop(AF_INET6, &ip6->ip6_src, src_str, sizeof(src_str)); + inet_ntop(AF_INET6, &ip6->ip6_dst, dst_str, sizeof(dst_str)); + os_log(OS_LOG_DEFAULT, + "%s: no interface match for packet from %s to %s proto %u received via %s", + __func__, src_str, dst_str, ip6->ip6_nxt, inifp->if_xname); + } + } + + return result; +} + void ip6_input(struct mbuf *m) { struct ip6_hdr *ip6; - int off = sizeof (struct ip6_hdr), nest; + int off = sizeof(struct ip6_hdr), nest; u_int32_t plen; u_int32_t rtalert = ~0; int nxt = 0, ours = 0; struct ifnet *inifp, *deliverifp = NULL; ipfilter_t inject_ipfref = NULL; int seen = 1; - struct in6_ifaddr *ia6 = NULL; - struct sockaddr_in6 *dst6; #if DUMMYNET struct m_tag *tag; + struct ip_fw_args args = {}; #endif /* DUMMYNET */ - struct { - struct route_in6 rin6; -#if DUMMYNET - struct ip_fw_args args; -#endif /* DUMMYNET */ - } ip6ibz; -#define rin6 ip6ibz.rin6 -#define args ip6ibz.args - - /* zero out {rin6, args} */ - bzero(&ip6ibz, sizeof (ip6ibz)); + struct route_in6 rin6 = {}; /* * Check if the packet we received is valid after interface filter @@ -509,7 +819,7 @@ ip6_input(struct mbuf *m) VERIFY(inifp != NULL); /* Perform IP header alignment fixup, if needed */ - IP6_HDR_ALIGNMENT_FIXUP(m, inifp, return); + IP6_HDR_ALIGNMENT_FIXUP(m, inifp, return ); m->m_pkthdr.pkt_flags &= ~PKTF_FORWARDED; #if IPSEC @@ -529,9 +839,9 @@ ip6_input(struct mbuf *m) #if DUMMYNET if ((tag = m_tag_locate(m, KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_DUMMYNET, NULL)) != NULL) { - struct dn_pkt_tag *dn_tag; + struct dn_pkt_tag *dn_tag; - dn_tag = (struct dn_pkt_tag *)(tag+1); + dn_tag = (struct dn_pkt_tag *)(tag + 1); args.fwa_pf_rule = dn_tag->dn_pf_rule; @@ -562,12 +872,13 @@ ip6_input(struct mbuf *m) * mbuf statistics */ if (m->m_flags & M_EXT) { - if (m->m_next != NULL) + if (m->m_next != NULL) { ip6stat.ip6s_mext2m++; - else + } else { ip6stat.ip6s_mext1++; + } } else { -#define M2MMAX (sizeof (ip6stat.ip6s_m2m) / sizeof (ip6stat.ip6s_m2m[0])) +#define M2MMAX (sizeof (ip6stat.ip6s_m2m) / sizeof (ip6stat.ip6s_m2m[0])) if (m->m_next != NULL) { if (m->m_pkthdr.pkt_flags & PKTF_LOOP) { /* XXX */ @@ -586,8 +897,9 @@ ip6_input(struct mbuf *m) /* * Drop the packet if IPv6 operation is disabled on the interface. */ - if (inifp->if_eflags & IFEF_IPV6_DISABLED) + if (inifp->if_eflags & IFEF_IPV6_DISABLED) { goto bad; + } in6_ifstat_inc_na(inifp, ifs6_in_receive); ip6stat.ip6s_total++; @@ -600,9 +912,10 @@ ip6_input(struct mbuf *m) if (m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) { struct mbuf *n; - MGETHDR(n, M_DONTWAIT, MT_HEADER); /* MAC-OK */ - if (n) + MGETHDR(n, M_DONTWAIT, MT_HEADER); /* MAC-OK */ + if (n) { M_COPY_PKTHDR(n, m); + } if (n && m->m_pkthdr.len > MHLEN) { MCLGET(n, M_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { @@ -610,18 +923,19 @@ ip6_input(struct mbuf *m) n = NULL; } } - if (n == NULL) + if (n == NULL) { goto bad; + } m_copydata(m, 0, m->m_pkthdr.len, mtod(n, caddr_t)); n->m_len = m->m_pkthdr.len; m_freem(m); m = n; } - IP6_EXTHDR_CHECK(m, 0, sizeof (struct ip6_hdr), { goto done; }); + IP6_EXTHDR_CHECK(m, 0, sizeof(struct ip6_hdr), { goto done; }); - if (m->m_len < sizeof (struct ip6_hdr)) { - if ((m = m_pullup(m, sizeof (struct ip6_hdr))) == 0) { + if (m->m_len < sizeof(struct ip6_hdr)) { + if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == 0) { ip6stat.ip6s_toosmall++; in6_ifstat_inc(inifp, ifs6_in_hdrerr); goto done; @@ -702,22 +1016,6 @@ ip6_input(struct mbuf *m) goto bad; } #endif -#if IPFW2 - /* - * Check with the firewall... - */ - if (ip6_fw_enable && ip6_fw_chk_ptr) { - u_short port = 0; - /* If ipfw says divert, we have to just drop packet */ - /* use port as a dummy argument */ - if ((*ip6_fw_chk_ptr)(&ip6, NULL, &port, &m)) { - m_freem(m); - m = NULL; - } - if (!m) - goto done; - } -#endif /* IPFW2 */ /* * Naively assume we can attribute inbound data to the route we would @@ -739,9 +1037,6 @@ ip6_input(struct mbuf *m) } } - /* for consistency */ - m->m_pkthdr.pkt_proto = ip6->ip6_nxt; - #if DUMMYNET check_with_pf: #endif /* DUMMYNET */ @@ -783,24 +1078,28 @@ check_with_pf: } if (m->m_pkthdr.pkt_flags & PKTF_IFAINFO) { - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) + if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) { ip6->ip6_src.s6_addr16[1] = htons(m->m_pkthdr.src_ifindex); - if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst)) + } + if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst)) { ip6->ip6_dst.s6_addr16[1] = htons(m->m_pkthdr.dst_ifindex); + } } else { - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) + if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) { ip6->ip6_src.s6_addr16[1] = htons(inifp->if_index); - if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst)) + } + if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst)) { ip6->ip6_dst.s6_addr16[1] = htons(inifp->if_index); + } } /* * Multicast check */ if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { - struct in6_multi *in6m = NULL; + struct in6_multi *in6m = NULL; in6_ifstat_inc_na(inifp, ifs6_in_mcast); /* @@ -820,125 +1119,38 @@ check_with_pf: goto bad; } deliverifp = inifp; - VERIFY(ia6 == NULL); - goto hbhcheck; - } - - /* - * Unicast check - * - * Fast path: see if the target is ourselves. - */ - lck_rw_lock_shared(&in6_ifaddr_rwlock); - for (ia6 = in6_ifaddrs; ia6 != NULL; ia6 = ia6->ia_next) { /* - * No reference is held on the address, as we just need - * to test for a few things while holding the RW lock. + * record dst address information into mbuf, if we don't have one yet. + * note that we are unable to record it, if the address is not listed + * as our interface address (e.g. multicast addresses, etc.) */ - if (IN6_ARE_ADDR_EQUAL(&ia6->ia_addr.sin6_addr, &ip6->ip6_dst)) - break; - } + if (deliverifp != NULL) { + struct in6_ifaddr *ia6 = NULL; - if (ia6 != NULL) { - /* - * For performance, test without acquiring the address lock; - * a lot of things in the address are set once and never - * changed (e.g. ia_ifp.) - */ - if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) { - /* this address is ready */ - ours = 1; - deliverifp = ia6->ia_ifp; - /* - * record dst address information into mbuf. - */ - (void) ip6_setdstifaddr_info(m, 0, ia6); - lck_rw_done(&in6_ifaddr_rwlock); - goto hbhcheck; + ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); + if (ia6 != NULL) { + (void) ip6_setdstifaddr_info(m, 0, ia6); + IFA_REMREF(&ia6->ia_ifa); + } else { + (void) ip6_setdstifaddr_info(m, inifp->if_index, NULL); + } } - lck_rw_done(&in6_ifaddr_rwlock); - ia6 = NULL; - /* address is not ready, so discard the packet. */ - nd6log((LOG_INFO, "%s: packet to an unready address %s->%s\n", - __func__, ip6_sprintf(&ip6->ip6_src), - ip6_sprintf(&ip6->ip6_dst))); - goto bad; - } - lck_rw_done(&in6_ifaddr_rwlock); - - /* - * Slow path: route lookup. - */ - dst6 = SIN6(&rin6.ro_dst); - dst6->sin6_len = sizeof (struct sockaddr_in6); - dst6->sin6_family = AF_INET6; - dst6->sin6_addr = ip6->ip6_dst; - - rtalloc_scoped_ign((struct route *)&rin6, - RTF_PRCLONING, IFSCOPE_NONE); - if (rin6.ro_rt != NULL) - RT_LOCK_SPIN(rin6.ro_rt); - -#define rt6_key(r) (SIN6((r)->rt_nodes->rn_key)) - - /* - * Accept the packet if the forwarding interface to the destination - * according to the routing table is the loopback interface, - * unless the associated route has a gateway. - * Note that this approach causes to accept a packet if there is a - * route to the loopback interface for the destination of the packet. - * But we think it's even useful in some situations, e.g. when using - * a special daemon which wants to intercept the packet. - * - * XXX: some OSes automatically make a cloned route for the destination - * of an outgoing packet. If the outgoing interface of the packet - * is a loopback one, the kernel would consider the packet to be - * accepted, even if we have no such address assinged on the interface. - * We check the cloned flag of the route entry to reject such cases, - * assuming that route entries for our own addresses are not made by - * cloning (it should be true because in6_addloop explicitly installs - * the host route). However, we might have to do an explicit check - * while it would be less efficient. Or, should we rather install a - * reject route for such a case? - */ - if (rin6.ro_rt != NULL && - (rin6.ro_rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && -#if RTF_WASCLONED - !(rin6.ro_rt->rt_flags & RTF_WASCLONED) && -#endif - rin6.ro_rt->rt_ifp->if_type == IFT_LOOP) { - ia6 = (struct in6_ifaddr *)rin6.ro_rt->rt_ifa; + goto hbhcheck; + } else { /* - * Packets to a tentative, duplicated, or somehow invalid - * address must not be accepted. - * - * For performance, test without acquiring the address lock; - * a lot of things in the address are set once and never - * changed (e.g. ia_ifp.) + * Unicast check */ - if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) { - /* this address is ready */ + ip6_check_if_result_t check_if_result = IP6_CHECK_IF_NONE; + check_if_result = ip6_input_check_interface(m, ip6, inifp, &rin6, &deliverifp); + ASSERT(check_if_result != IP6_CHECK_IF_NONE); + if (check_if_result == IP6_CHECK_IF_OURS) { ours = 1; - deliverifp = ia6->ia_ifp; /* correct? */ - /* - * record dst address information into mbuf. - */ - (void) ip6_setdstifaddr_info(m, 0, ia6); - RT_UNLOCK(rin6.ro_rt); goto hbhcheck; + } else if (check_if_result == IP6_CHECK_IF_DROP) { + goto bad; } - RT_UNLOCK(rin6.ro_rt); - ia6 = NULL; - /* address is not ready, so discard the packet. */ - nd6log((LOG_INFO, "%s: packet to an unready address %s->%s\n", - __func__, ip6_sprintf(&ip6->ip6_src), - ip6_sprintf(&ip6->ip6_dst))); - goto bad; } - if (rin6.ro_rt != NULL) - RT_UNLOCK(rin6.ro_rt); - /* * Now there is no reason to process the packet if it's not our own * and we're not a router. @@ -946,23 +1158,19 @@ check_with_pf: if (!ip6_forwarding) { ip6stat.ip6s_cantforward++; in6_ifstat_inc(inifp, ifs6_in_discard); + /* + * Raise a kernel event if the packet received on cellular + * interface is not intended for local host. + * For now limit it to ICMPv6 packets. + */ + if (inifp->if_type == IFT_CELLULAR && + ip6->ip6_nxt == IPPROTO_ICMPV6) { + in6_ifstat_inc(inifp, ifs6_cantfoward_icmp6); + } goto bad; } hbhcheck: - /* - * record dst address information into mbuf, if we don't have one yet. - * note that we are unable to record it, if the address is not listed - * as our interface address (e.g. multicast addresses, etc.) - */ - if (deliverifp != NULL && ia6 == NULL) { - ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); - if (ia6 != NULL) { - (void) ip6_setdstifaddr_info(m, 0, ia6); - IFA_REMREF(&ia6->ia_ifa); - } - } - /* * Process Hop-by-Hop options header if it's contained. * m may be modified in ip6_hopopts_input(). @@ -972,11 +1180,17 @@ hbhcheck: if (ip6->ip6_nxt == IPPROTO_HOPOPTS) { struct ip6_hbh *hbh; + /* + * Mark the packet to imply that HBH option has been checked. + * This can only be true is the packet came in unfragmented + * or if the option is in the first fragment + */ + m->m_pkthdr.pkt_flags |= PKTF_HBH_CHKED; if (ip6_hopopts_input(&plen, &rtalert, &m, &off)) { -#if 0 /* touches NULL pointer */ +#if 0 /* touches NULL pointer */ in6_ifstat_inc(inifp, ifs6_in_discard); #endif - goto done; /* m have already been freed */ + goto done; /* m have already been freed */ } /* adjust pointer */ @@ -997,7 +1211,7 @@ hbhcheck: in6_ifstat_inc(inifp, ifs6_in_discard); in6_ifstat_inc(inifp, ifs6_in_hdrerr); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, - (caddr_t)&ip6->ip6_plen - (caddr_t)ip6); + (int)((caddr_t)&ip6->ip6_plen - (caddr_t)ip6)); goto done; } /* ip6_hopopts_input() ensures that mbuf is contiguous */ @@ -1024,8 +1238,9 @@ hbhcheck: break; } } - } else + } else { nxt = ip6->ip6_nxt; + } /* * Check that the amount of data in the buffers @@ -1033,35 +1248,13 @@ hbhcheck: * Trim mbufs if longer than we expect. * Drop packet if shorter than we expect. */ - if (m->m_pkthdr.len - sizeof (struct ip6_hdr) < plen) { + if (m->m_pkthdr.len - sizeof(struct ip6_hdr) < plen) { ip6stat.ip6s_tooshort++; in6_ifstat_inc(inifp, ifs6_in_truncated); goto bad; } - if (m->m_pkthdr.len > sizeof (struct ip6_hdr) + plen) { - /* - * Invalidate hardware checksum info if ip6_adj_clear_hwcksum - * is set; useful to handle buggy drivers. Note that this - * should not be enabled by default, as we may get here due - * to link-layer padding. - */ - if (ip6_adj_clear_hwcksum && - (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) && - !(inifp->if_flags & IFF_LOOPBACK) && - !(m->m_pkthdr.pkt_flags & PKTF_LOOP)) { - m->m_pkthdr.csum_flags &= ~CSUM_DATA_VALID; - m->m_pkthdr.csum_data = 0; - ip6stat.ip6s_adj_hwcsum_clr++; - } - - ip6stat.ip6s_adj++; - if (m->m_len == m->m_pkthdr.len) { - m->m_len = sizeof (struct ip6_hdr) + plen; - m->m_pkthdr.len = sizeof (struct ip6_hdr) + plen; - } else { - m_adj(m, sizeof (struct ip6_hdr) + plen - - m->m_pkthdr.len); - } + if (m->m_pkthdr.len > sizeof(struct ip6_hdr) + plen) { + ip6_input_adjust(m, ip6, plen, inifp); } /* @@ -1080,8 +1273,9 @@ hbhcheck: VERIFY(!ours || (m->m_pkthdr.pkt_flags & PKTF_PROXY_DST)); } - if (!ours) + if (!ours) { goto bad; + } } else if (!ours) { /* * The unicast forwarding function might return the packet @@ -1095,8 +1289,9 @@ hbhcheck: * proxied nodes on different links (src is link-local, dst * is target address.) */ - if ((m = ip6_forward(m, &rin6, 0)) == NULL) + if ((m = ip6_forward(m, &rin6, 0)) == NULL) { goto done; + } VERIFY(rin6.ro_rt != NULL); VERIFY(m->m_pkthdr.pkt_flags & PKTF_PROXY_DST); deliverifp = rin6.ro_rt->rt_ifp; @@ -1135,12 +1330,26 @@ injectit: * we do it once for the outermost protocol, and we assume each * protocol handler wouldn't mess with the alignment afterwards. */ - IP6_HDR_ALIGNMENT_FIXUP(m, inifp, return); + IP6_HDR_ALIGNMENT_FIXUP(m, inifp, return ); while (nxt != IPPROTO_DONE) { struct ipfilter *filter; int (*pr_input)(struct mbuf **, int *, int); + /* + * This would imply either IPPROTO_HOPOPTS was not the first + * option or it did not come in the first fragment. + */ + if (nxt == IPPROTO_HOPOPTS && + (m->m_pkthdr.pkt_flags & PKTF_HBH_CHKED) == 0) { + /* + * This implies that HBH option was not contained + * in the first fragment + */ + ip6stat.ip6s_badoptions++; + goto bad; + } + if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) { ip6stat.ip6s_toomanyhdr++; goto bad; @@ -1156,7 +1365,6 @@ injectit: goto bad; } - #if IPSEC /* * enforce IPsec policy checking if we are seeing last header. @@ -1175,19 +1383,20 @@ injectit: /* * Call IP filter */ - if (!TAILQ_EMPTY(&ipv6_filters)) { + if (!TAILQ_EMPTY(&ipv6_filters) && !IFNET_IS_INTCOPROC(inifp)) { ipf_ref(); TAILQ_FOREACH(filter, &ipv6_filters, ipf_link) { if (seen == 0) { if ((struct ipfilter *)inject_ipfref == - filter) + filter) { seen = 1; + } } else if (filter->ipf_filter.ipf_input) { errno_t result; result = filter->ipf_filter.ipf_input( - filter->ipf_filter.cookie, - (mbuf_t *)&m, off, nxt); + filter->ipf_filter.cookie, + (mbuf_t *)&m, off, (uint8_t)nxt); if (result == EJUSTRETURN) { ipf_unref(); goto done; @@ -1243,9 +1452,10 @@ ip6_setsrcifaddr_info(struct mbuf *m, uint32_t src_idx, struct in6_ifaddr *ia6) m->m_pkthdr.src_iff = (ia6->ia6_flags & 0xffff); } else { m->m_pkthdr.src_iff = 0; - m->m_pkthdr.src_ifindex = src_idx; - if (src_idx != 0) + m->m_pkthdr.src_ifindex = (uint16_t)src_idx; + if (src_idx != 0) { m->m_pkthdr.pkt_flags |= PKTF_IFAINFO; + } } } @@ -1267,9 +1477,10 @@ ip6_setdstifaddr_info(struct mbuf *m, uint32_t dst_idx, struct in6_ifaddr *ia6) m->m_pkthdr.dst_iff = (ia6->ia6_flags & 0xffff); } else { m->m_pkthdr.dst_iff = 0; - m->m_pkthdr.dst_ifindex = dst_idx; - if (dst_idx != 0) + m->m_pkthdr.dst_ifindex = (uint16_t)dst_idx; + if (dst_idx != 0) { m->m_pkthdr.pkt_flags |= PKTF_IFAINFO; + } } } @@ -1278,16 +1489,19 @@ ip6_getsrcifaddr_info(struct mbuf *m, uint32_t *src_idx, uint32_t *ia6f) { VERIFY(m->m_flags & M_PKTHDR); - if (!(m->m_pkthdr.pkt_flags & PKTF_IFAINFO)) - return (-1); + if (!(m->m_pkthdr.pkt_flags & PKTF_IFAINFO)) { + return -1; + } - if (src_idx != NULL) + if (src_idx != NULL) { *src_idx = m->m_pkthdr.src_ifindex; + } - if (ia6f != NULL) + if (ia6f != NULL) { *ia6f = m->m_pkthdr.src_iff; + } - return (0); + return 0; } int @@ -1295,16 +1509,19 @@ ip6_getdstifaddr_info(struct mbuf *m, uint32_t *dst_idx, uint32_t *ia6f) { VERIFY(m->m_flags & M_PKTHDR); - if (!(m->m_pkthdr.pkt_flags & PKTF_IFAINFO)) - return (-1); + if (!(m->m_pkthdr.pkt_flags & PKTF_IFAINFO)) { + return -1; + } - if (dst_idx != NULL) + if (dst_idx != NULL) { *dst_idx = m->m_pkthdr.dst_ifindex; + } - if (ia6f != NULL) + if (ia6f != NULL) { *ia6f = m->m_pkthdr.dst_iff; + } - return (0); + return 0; } /* @@ -1321,23 +1538,24 @@ ip6_hopopts_input(uint32_t *plenp, uint32_t *rtalertp, struct mbuf **mp, u_int8_t *opt; /* validation of the length of the header */ - IP6_EXTHDR_CHECK(m, off, sizeof (*hbh), return (-1)); + IP6_EXTHDR_CHECK(m, off, sizeof(*hbh), return (-1)); hbh = (struct ip6_hbh *)(mtod(m, caddr_t) + off); hbhlen = (hbh->ip6h_len + 1) << 3; IP6_EXTHDR_CHECK(m, off, hbhlen, return (-1)); hbh = (struct ip6_hbh *)(mtod(m, caddr_t) + off); off += hbhlen; - hbhlen -= sizeof (struct ip6_hbh); - opt = (u_int8_t *)hbh + sizeof (struct ip6_hbh); + hbhlen -= sizeof(struct ip6_hbh); + opt = (u_int8_t *)hbh + sizeof(struct ip6_hbh); - if (ip6_process_hopopts(m, (u_int8_t *)hbh + sizeof (struct ip6_hbh), - hbhlen, rtalertp, plenp) < 0) - return (-1); + if (ip6_process_hopopts(m, (u_int8_t *)hbh + sizeof(struct ip6_hbh), + hbhlen, rtalertp, plenp) < 0) { + return -1; + } *offp = off; *mp = m; - return (0); + return 0; } /* @@ -1351,19 +1569,15 @@ ip6_hopopts_input(uint32_t *plenp, uint32_t *rtalertp, struct mbuf **mp, * opthead + hbhlen is located in continuous memory region. */ int -ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) - struct mbuf *m; - u_int8_t *opthead; - int hbhlen; - u_int32_t *rtalertp; - u_int32_t *plenp; +ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, + u_int32_t *rtalertp, u_int32_t *plenp) { struct ip6_hdr *ip6; int optlen = 0; u_int8_t *opt = opthead; u_int16_t rtalert_val; u_int32_t jumboplen; - const int erroff = sizeof (struct ip6_hdr) + sizeof (struct ip6_hbh); + const int erroff = sizeof(struct ip6_hdr) + sizeof(struct ip6_hbh); for (; hbhlen > 0; hbhlen -= optlen, opt += optlen) { switch (*opt) { @@ -1386,9 +1600,9 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) if (*(opt + 1) != IP6OPT_RTALERT_LEN - 2) { /* XXX stat */ icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - erroff + opt + 1 - opthead); - return (-1); + ICMP6_PARAMPROB_HEADER, + (int)(erroff + opt + 1 - opthead)); + return -1; } optlen = IP6OPT_RTALERT_LEN; bcopy((caddr_t)(opt + 2), (caddr_t)&rtalert_val, 2); @@ -1403,9 +1617,9 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) if (*(opt + 1) != IP6OPT_JUMBO_LEN - 2) { /* XXX stat */ icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - erroff + opt + 1 - opthead); - return (-1); + ICMP6_PARAMPROB_HEADER, + (int)(erroff + opt + 1 - opthead)); + return -1; } optlen = IP6OPT_JUMBO_LEN; @@ -1417,16 +1631,16 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) if (ip6->ip6_plen) { ip6stat.ip6s_badoptions++; icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - erroff + opt - opthead); - return (-1); + ICMP6_PARAMPROB_HEADER, + (int)(erroff + opt - opthead)); + return -1; } /* * We may see jumbolen in unaligned location, so * we'd need to perform bcopy(). */ - bcopy(opt + 2, &jumboplen, sizeof (jumboplen)); + bcopy(opt + 2, &jumboplen, sizeof(jumboplen)); jumboplen = (u_int32_t)htonl(jumboplen); #if 1 @@ -1441,9 +1655,9 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) if (*plenp != 0) { ip6stat.ip6s_badoptions++; icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - erroff + opt + 2 - opthead); - return (-1); + ICMP6_PARAMPROB_HEADER, + (int)(erroff + opt + 2 - opthead)); + return -1; } #endif @@ -1453,14 +1667,14 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) if (jumboplen <= IPV6_MAXPACKET) { ip6stat.ip6s_badoptions++; icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - erroff + opt + 2 - opthead); - return (-1); + ICMP6_PARAMPROB_HEADER, + (int)(erroff + opt + 2 - opthead)); + return -1; } *plenp = jumboplen; break; - default: /* unknown option */ + default: /* unknown option */ if (hbhlen < IP6OPT_MINLEN) { ip6stat.ip6s_toosmall++; goto bad; @@ -1468,18 +1682,18 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) optlen = ip6_unknown_opt(opt, m, erroff + opt - opthead); if (optlen == -1) { - return (-1); + return -1; } optlen += 2; break; } } - return (0); + return 0; bad: m_freem(m); - return (-1); + return -1; } /* @@ -1489,38 +1703,38 @@ bad: * is not continuous in order to return an ICMPv6 error. */ int -ip6_unknown_opt(uint8_t *optp, struct mbuf *m, int off) +ip6_unknown_opt(uint8_t *optp, struct mbuf *m, size_t off) { struct ip6_hdr *ip6; switch (IP6OPT_TYPE(*optp)) { case IP6OPT_TYPE_SKIP: /* ignore the option */ - return ((int)*(optp + 1)); + return (int)*(optp + 1); - case IP6OPT_TYPE_DISCARD: /* silently discard */ + case IP6OPT_TYPE_DISCARD: /* silently discard */ m_freem(m); - return (-1); + return -1; case IP6OPT_TYPE_FORCEICMP: /* send ICMP even if multicasted */ ip6stat.ip6s_badoptions++; - icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_OPTION, off); - return (-1); + icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_OPTION, (int)off); + return -1; case IP6OPT_TYPE_ICMP: /* send ICMP if not multicasted */ ip6stat.ip6s_badoptions++; ip6 = mtod(m, struct ip6_hdr *); if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) || - (m->m_flags & (M_BCAST|M_MCAST))) { + (m->m_flags & (M_BCAST | M_MCAST))) { m_freem(m); } else { icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_OPTION, off); + ICMP6_PARAMPROB_OPTION, (int)off); } - return (-1); + return -1; } - m_freem(m); /* XXX: NOTREACHED */ - return (-1); + m_freem(m); /* XXX: NOTREACHED */ + return -1; } /* @@ -1548,66 +1762,124 @@ ip6_savecontrol_v4(struct inpcb *inp, struct mbuf *m, struct mbuf **mp, struct timeval tv; getmicrotime(&tv); - mp = sbcreatecontrol_mbuf((caddr_t)&tv, sizeof (tv), + mp = sbcreatecontrol_mbuf((caddr_t)&tv, sizeof(tv), SCM_TIMESTAMP, SOL_SOCKET, mp); - if (*mp == NULL) - return (NULL); + if (*mp == NULL) { + return NULL; + } } if ((inp->inp_socket->so_options & SO_TIMESTAMP_MONOTONIC) != 0) { uint64_t time; time = mach_absolute_time(); - mp = sbcreatecontrol_mbuf((caddr_t)&time, sizeof (time), + mp = sbcreatecontrol_mbuf((caddr_t)&time, sizeof(time), SCM_TIMESTAMP_MONOTONIC, SOL_SOCKET, mp); - if (*mp == NULL) - return (NULL); + if (*mp == NULL) { + return NULL; + } + } + if ((inp->inp_socket->so_options & SO_TIMESTAMP_CONTINUOUS) != 0) { + uint64_t time; + + time = mach_continuous_time(); + mp = sbcreatecontrol_mbuf((caddr_t)&time, sizeof(time), + SCM_TIMESTAMP_CONTINUOUS, SOL_SOCKET, mp); + if (*mp == NULL) { + return NULL; + } } if ((inp->inp_socket->so_flags & SOF_RECV_TRAFFIC_CLASS) != 0) { int tc = m_get_traffic_class(m); - mp = sbcreatecontrol_mbuf((caddr_t)&tc, sizeof (tc), + mp = sbcreatecontrol_mbuf((caddr_t)&tc, sizeof(tc), SO_TRAFFIC_CLASS, SOL_SOCKET, mp); - if (*mp == NULL) - return (NULL); + if (*mp == NULL) { + return NULL; + } } +#define IS2292(inp, x, y) (((inp)->inp_flags & IN6P_RFC2292) ? (x) : (y)) if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { - if (v4only != NULL) + if (v4only != NULL) { *v4only = 1; - return (mp); + } + + // Send ECN flags for v4-mapped addresses + if ((inp->inp_flags & IN6P_TCLASS) != 0) { + struct ip *ip_header = mtod(m, struct ip *); + + int tclass = (int)(ip_header->ip_tos); + mp = sbcreatecontrol_mbuf((caddr_t)&tclass, sizeof(tclass), + IPV6_TCLASS, IPPROTO_IPV6, mp); + if (*mp == NULL) { + return NULL; + } + } + + // Send IN6P_PKTINFO for v4-mapped address + if ((inp->inp_flags & IN6P_PKTINFO) != 0 +#if CONTENT_FILTER + /* Content Filter needs to see local address */ + || (inp->inp_socket->so_cfil_db != NULL) +#endif + ) { + struct in6_pktinfo pi6 = { + .ipi6_addr = IN6ADDR_V4MAPPED_INIT, + .ipi6_ifindex = (m && m->m_pkthdr.rcvif) ? m->m_pkthdr.rcvif->if_index : 0, + }; + + struct ip *ip_header = mtod(m, struct ip *); + bcopy(&ip_header->ip_dst, &pi6.ipi6_addr.s6_addr32[3], sizeof(struct in_addr)); + + mp = sbcreatecontrol_mbuf((caddr_t)&pi6, + sizeof(struct in6_pktinfo), + IS2292(inp, IPV6_2292PKTINFO, IPV6_PKTINFO), + IPPROTO_IPV6, mp); + if (*mp == NULL) { + return NULL; + } + } + return mp; } -#define IS2292(inp, x, y) (((inp)->inp_flags & IN6P_RFC2292) ? (x) : (y)) /* RFC 2292 sec. 5 */ - if ((inp->inp_flags & IN6P_PKTINFO) != 0) { + if ((inp->inp_flags & IN6P_PKTINFO) != 0 +#if CONTENT_FILTER + /* Content Filter needs to see local address */ + || (inp->inp_socket->so_cfil_db != NULL) +#endif + ) { struct in6_pktinfo pi6; - bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof (struct in6_addr)); - in6_clearscope(&pi6.ipi6_addr); /* XXX */ + bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr)); + in6_clearscope(&pi6.ipi6_addr); /* XXX */ pi6.ipi6_ifindex = (m && m->m_pkthdr.rcvif) ? m->m_pkthdr.rcvif->if_index : 0; mp = sbcreatecontrol_mbuf((caddr_t)&pi6, - sizeof (struct in6_pktinfo), + sizeof(struct in6_pktinfo), IS2292(inp, IPV6_2292PKTINFO, IPV6_PKTINFO), IPPROTO_IPV6, mp); - if (*mp == NULL) - return (NULL); + if (*mp == NULL) { + return NULL; + } } if ((inp->inp_flags & IN6P_HOPLIMIT) != 0) { int hlim = ip6->ip6_hlim & 0xff; - mp = sbcreatecontrol_mbuf((caddr_t)&hlim, sizeof (int), + mp = sbcreatecontrol_mbuf((caddr_t)&hlim, sizeof(int), IS2292(inp, IPV6_2292HOPLIMIT, IPV6_HOPLIMIT), IPPROTO_IPV6, mp); - if (*mp == NULL) - return (NULL); + if (*mp == NULL) { + return NULL; + } } - if (v4only != NULL) + if (v4only != NULL) { *v4only = 0; - return (mp); + } + return mp; } int @@ -1619,12 +1891,14 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) *mp = NULL; np = ip6_savecontrol_v4(in6p, m, mp, &v4only); - if (np == NULL) + if (np == NULL) { goto no_mbufs; + } mp = np; - if (v4only) - return (0); + if (v4only) { + return 0; + } if ((in6p->inp_flags & IN6P_TCLASS) != 0) { u_int32_t flowinfo; @@ -1634,10 +1908,11 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) flowinfo >>= 20; tclass = flowinfo & 0xff; - mp = sbcreatecontrol_mbuf((caddr_t)&tclass, sizeof (tclass), + mp = sbcreatecontrol_mbuf((caddr_t)&tclass, sizeof(tclass), IPV6_TCLASS, IPPROTO_IPV6, mp); - if (*mp == NULL) + if (*mp == NULL) { goto no_mbufs; + } } /* @@ -1680,7 +1955,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) } if ((in6p->inp_flags & (IN6P_RTHDR | IN6P_DSTOPTS)) != 0) { - int nxt = ip6->ip6_nxt, off = sizeof (struct ip6_hdr); + int nxt = ip6->ip6_nxt, off = sizeof(struct ip6_hdr); /* * Search for destination options headers or routing @@ -1689,7 +1964,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) * Note that the order of the headers remains in * the chain of ancillary data. */ - while (1) { /* is explicit loop prevention necessary? */ + while (1) { /* is explicit loop prevention necessary? */ struct ip6_ext *ip6e = NULL; int elen; @@ -1707,20 +1982,24 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) goto loopend; } - if (off + sizeof (*ip6e) > m->m_len) + if (off + sizeof(*ip6e) > m->m_len) { goto loopend; + } ip6e = (struct ip6_ext *)(mtod(m, caddr_t) + off); - if (nxt == IPPROTO_AH) + if (nxt == IPPROTO_AH) { elen = (ip6e->ip6e_len + 2) << 2; - else + } else { elen = (ip6e->ip6e_len + 1) << 3; - if (off + elen > m->m_len) + } + if (off + elen > m->m_len) { goto loopend; + } switch (nxt) { case IPPROTO_DSTOPTS: - if (!(in6p->inp_flags & IN6P_DSTOPTS)) + if (!(in6p->inp_flags & IN6P_DSTOPTS)) { break; + } mp = sbcreatecontrol_mbuf((caddr_t)ip6e, elen, IS2292(in6p, IPV6_2292DSTOPTS, @@ -1730,8 +2009,9 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) } break; case IPPROTO_ROUTING: - if (!(in6p->inp_flags & IN6P_RTHDR)) + if (!(in6p->inp_flags & IN6P_RTHDR)) { break; + } mp = sbcreatecontrol_mbuf((caddr_t)ip6e, elen, IS2292(in6p, IPV6_2292RTHDR, IPV6_RTHDR), @@ -1752,7 +2032,6 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) * other cases). */ goto loopend; - } /* proceed with the next header. */ @@ -1763,11 +2042,11 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) loopend: ; } - return (0); + return 0; no_mbufs: ip6stat.ip6s_pktdropcntrl++; /* XXX increment a stat to show the failure */ - return (ENOBUFS); + return ENOBUFS; } #undef IS2292 @@ -1780,32 +2059,47 @@ ip6_notify_pmtu(struct inpcb *in6p, struct sockaddr_in6 *dst, u_int32_t *mtu) so = in6p->inp_socket; - if (mtu == NULL) + if ((in6p->inp_flags & IN6P_MTU) == 0) { + return; + } + + if (mtu == NULL) { return; + } #ifdef DIAGNOSTIC - if (so == NULL) { /* I believe this is impossible */ + if (so == NULL) { /* I believe this is impossible */ panic("ip6_notify_pmtu: socket is NULL"); /* NOTREACHED */ } #endif - bzero(&mtuctl, sizeof (mtuctl)); /* zero-clear for safety */ + if (IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr) && + (so->so_proto == NULL || so->so_proto->pr_protocol == IPPROTO_TCP)) { + return; + } + + if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr) && + !IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, &dst->sin6_addr)) { + return; + } + + bzero(&mtuctl, sizeof(mtuctl)); /* zero-clear for safety */ mtuctl.ip6m_mtu = *mtu; mtuctl.ip6m_addr = *dst; - if (sa6_recoverscope(&mtuctl.ip6m_addr, TRUE)) + if (sa6_recoverscope(&mtuctl.ip6m_addr, TRUE)) { return; + } - if ((m_mtu = sbcreatecontrol((caddr_t)&mtuctl, sizeof (mtuctl), - IPV6_PATHMTU, IPPROTO_IPV6)) == NULL) + if ((m_mtu = sbcreatecontrol((caddr_t)&mtuctl, sizeof(mtuctl), + IPV6_PATHMTU, IPPROTO_IPV6)) == NULL) { return; + } if (sbappendaddr(&so->so_rcv, SA(dst), NULL, m_mtu, NULL) == 0) { - m_freem(m_mtu); - /* XXX: should count statistics */ - } else { - sorwakeup(so); + return; } + sorwakeup(so); } /* @@ -1821,26 +2115,24 @@ ip6_notify_pmtu(struct inpcb *in6p, struct sockaddr_in6 *dst, u_int32_t *mtu) * we develop `neater' mechanism to process extension headers. */ char * -ip6_get_prevhdr(m, off) - struct mbuf *m; - int off; +ip6_get_prevhdr(struct mbuf *m, int off) { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - if (off == sizeof (struct ip6_hdr)) { - return ((char *)&ip6->ip6_nxt); + if (off == sizeof(struct ip6_hdr)) { + return (char *)&ip6->ip6_nxt; } else { int len, nxt; struct ip6_ext *ip6e = NULL; nxt = ip6->ip6_nxt; - len = sizeof (struct ip6_hdr); + len = sizeof(struct ip6_hdr); while (len < off) { ip6e = (struct ip6_ext *)(mtod(m, caddr_t) + len); switch (nxt) { case IPPROTO_FRAGMENT: - len += sizeof (struct ip6_frag); + len += sizeof(struct ip6_frag); break; case IPPROTO_AH: len += (ip6e->ip6e_len + 2) << 2; @@ -1851,10 +2143,11 @@ ip6_get_prevhdr(m, off) } nxt = ip6e->ip6e_nxt; } - if (ip6e) - return ((char *)&ip6e->ip6e_nxt); - else - return (NULL); + if (ip6e) { + return (char *)&ip6e->ip6e_nxt; + } else { + return NULL; + } } } @@ -1870,66 +2163,74 @@ ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp) /* just in case */ VERIFY(m != NULL); - if ((m->m_flags & M_PKTHDR) == 0 || m->m_pkthdr.len < off) - return (-1); + if ((m->m_flags & M_PKTHDR) == 0 || m->m_pkthdr.len < off) { + return -1; + } switch (proto) { case IPPROTO_IPV6: - if (m->m_pkthdr.len < off + sizeof (ip6)) - return (-1); - m_copydata(m, off, sizeof (ip6), (caddr_t)&ip6); - if (nxtp) + if (m->m_pkthdr.len < off + sizeof(ip6)) { + return -1; + } + m_copydata(m, off, sizeof(ip6), (caddr_t)&ip6); + if (nxtp) { *nxtp = ip6.ip6_nxt; - off += sizeof (ip6); - return (off); + } + off += sizeof(ip6); + return off; case IPPROTO_FRAGMENT: /* * terminate parsing if it is not the first fragment, * it does not make sense to parse through it. */ - if (m->m_pkthdr.len < off + sizeof (fh)) - return (-1); - m_copydata(m, off, sizeof (fh), (caddr_t)&fh); + if (m->m_pkthdr.len < off + sizeof(fh)) { + return -1; + } + m_copydata(m, off, sizeof(fh), (caddr_t)&fh); /* IP6F_OFF_MASK = 0xfff8(BigEndian), 0xf8ff(LittleEndian) */ - if (fh.ip6f_offlg & IP6F_OFF_MASK) - return (-1); - if (nxtp) + if (fh.ip6f_offlg & IP6F_OFF_MASK) { + return -1; + } + if (nxtp) { *nxtp = fh.ip6f_nxt; - off += sizeof (struct ip6_frag); - return (off); + } + off += sizeof(struct ip6_frag); + return off; case IPPROTO_AH: - if (m->m_pkthdr.len < off + sizeof (ip6e)) - return (-1); - m_copydata(m, off, sizeof (ip6e), (caddr_t)&ip6e); - if (nxtp) + if (m->m_pkthdr.len < off + sizeof(ip6e)) { + return -1; + } + m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e); + if (nxtp) { *nxtp = ip6e.ip6e_nxt; + } off += (ip6e.ip6e_len + 2) << 2; - return (off); + return off; case IPPROTO_HOPOPTS: case IPPROTO_ROUTING: case IPPROTO_DSTOPTS: - if (m->m_pkthdr.len < off + sizeof (ip6e)) - return (-1); - m_copydata(m, off, sizeof (ip6e), (caddr_t)&ip6e); - if (nxtp) + if (m->m_pkthdr.len < off + sizeof(ip6e)) { + return -1; + } + m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e); + if (nxtp) { *nxtp = ip6e.ip6e_nxt; + } off += (ip6e.ip6e_len + 1) << 3; - return (off); + return off; case IPPROTO_NONE: case IPPROTO_ESP: case IPPROTO_IPCOMP: /* give up */ - return (-1); + return -1; default: - return (-1); + return -1; } - - return (-1); } /* @@ -1947,22 +2248,61 @@ ip6_lasthdr(struct mbuf *m, int off, int proto, int *nxtp) } while (1) { newoff = ip6_nexthdr(m, off, proto, nxtp); - if (newoff < 0) - return (off); - else if (newoff < off) - return (-1); /* invalid */ - else if (newoff == off) - return (newoff); + if (newoff < 0) { + return off; + } else if (newoff < off) { + return -1; /* invalid */ + } else if (newoff == off) { + return newoff; + } off = newoff; proto = *nxtp; } } +boolean_t +ip6_pkt_has_ulp(struct mbuf *m) +{ + int off = 0, nxt = IPPROTO_NONE; + + off = ip6_lasthdr(m, 0, IPPROTO_IPV6, &nxt); + if (off < 0 || m->m_pkthdr.len < off) { + return FALSE; + } + + switch (nxt) { + case IPPROTO_TCP: + if (off + sizeof(struct tcphdr) > m->m_pkthdr.len) { + return FALSE; + } + break; + case IPPROTO_UDP: + if (off + sizeof(struct udphdr) > m->m_pkthdr.len) { + return FALSE; + } + break; + case IPPROTO_ICMPV6: + if (off + sizeof(uint32_t) > m->m_pkthdr.len) { + return FALSE; + } + break; + case IPPROTO_NONE: + return TRUE; + case IPPROTO_ESP: + return TRUE; + case IPPROTO_IPCOMP: + return TRUE; + default: + return FALSE; + } + return TRUE; +} + struct ip6aux * ip6_addaux(struct mbuf *m) { - struct m_tag *tag; + struct m_tag *tag; /* Check if one is already allocated */ tag = m_tag_locate(m, KERNEL_MODULE_TAG_ID, @@ -1970,7 +2310,7 @@ ip6_addaux(struct mbuf *m) if (tag == NULL) { /* Allocate a tag */ tag = m_tag_create(KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_INET6, - sizeof (struct ip6aux), M_DONTWAIT, m); + sizeof(struct ip6aux), M_DONTWAIT, m); /* Attach it to the mbuf */ if (tag) { @@ -1978,24 +2318,24 @@ ip6_addaux(struct mbuf *m) } } - return (tag ? (struct ip6aux *)(tag + 1) : NULL); + return tag ? (struct ip6aux *)(tag + 1) : NULL; } struct ip6aux * ip6_findaux(struct mbuf *m) { - struct m_tag *tag; + struct m_tag *tag; tag = m_tag_locate(m, KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_INET6, NULL); - return (tag ? (struct ip6aux *)(tag + 1) : NULL); + return tag ? (struct ip6aux *)(tag + 1) : NULL; } void ip6_delaux(struct mbuf *m) { - struct m_tag *tag; + struct m_tag *tag; tag = m_tag_locate(m, KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_INET6, NULL); @@ -2010,21 +2350,21 @@ ip6_delaux(struct mbuf *m) void ip6_drain(void) { - frag6_drain(); /* fragments */ - in6_rtqdrain(); /* protocol cloned routes */ - nd6_drain(NULL); /* cloned routes: ND6 */ + frag6_drain(); /* fragments */ + in6_rtqdrain(); /* protocol cloned routes */ + nd6_drain(NULL); /* cloned routes: ND6 */ } /* * System control for IP6 */ -u_char inet6ctlerrmap[PRC_NCMDS] = { - 0, 0, 0, 0, - 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH, - EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED, - EMSGSIZE, EHOSTUNREACH, 0, 0, - 0, 0, 0, 0, +u_char inet6ctlerrmap[PRC_NCMDS] = { + 0, 0, 0, 0, + 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH, + EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED, + EMSGSIZE, EHOSTUNREACH, 0, 0, + 0, 0, 0, 0, ENOPROTOOPT }; @@ -2036,8 +2376,9 @@ sysctl_reset_ip6_input_stats SYSCTL_HANDLER_ARGS i = ip6_input_measure; error = sysctl_handle_int(oidp, &i, 0, req); - if (error || req->newptr == USER_ADDR_NULL) + if (error || req->newptr == USER_ADDR_NULL) { goto done; + } /* impose bounds */ if (i < 0 || i > 1) { error = EINVAL; @@ -2048,7 +2389,7 @@ sysctl_reset_ip6_input_stats SYSCTL_HANDLER_ARGS } ip6_input_measure = i; done: - return (error); + return error; } static int @@ -2060,8 +2401,9 @@ sysctl_ip6_input_measure_bins SYSCTL_HANDLER_ARGS i = ip6_input_measure_bins; error = sysctl_handle_quad(oidp, &i, 0, req); - if (error || req->newptr == USER_ADDR_NULL) + if (error || req->newptr == USER_ADDR_NULL) { goto done; + } /* validate data */ if (!net_perf_validate_bins(i)) { error = EINVAL; @@ -2069,15 +2411,90 @@ sysctl_ip6_input_measure_bins SYSCTL_HANDLER_ARGS } ip6_input_measure_bins = i; done: - return (error); + return error; } static int sysctl_ip6_input_getperf SYSCTL_HANDLER_ARGS { #pragma unused(oidp, arg1, arg2) - if (req->oldptr == USER_ADDR_NULL) - req->oldlen = (size_t)sizeof (struct ipstat); + if (req->oldptr == USER_ADDR_NULL) { + req->oldlen = (size_t)sizeof(struct net_perf); + } - return (SYSCTL_OUT(req, &net_perf, MIN(sizeof (net_perf), req->oldlen))); + return SYSCTL_OUT(req, &net_perf, MIN(sizeof(net_perf), req->oldlen)); +} + + +/* + * Initialize IPv6 source address hash table. + */ +static void +in6_ifaddrhashtbl_init(void) +{ + int i, k, p; + + if (in6_ifaddrhashtbl != NULL) { + return; + } + + PE_parse_boot_argn("ina6ddr_nhash", &in6addr_nhash, + sizeof(in6addr_nhash)); + if (in6addr_nhash == 0) { + in6addr_nhash = IN6ADDR_NHASH; + } + + MALLOC(in6_ifaddrhashtbl, struct in6_ifaddrhashhead *, + in6addr_nhash * sizeof(*in6_ifaddrhashtbl), + M_IFADDR, M_WAITOK | M_ZERO); + if (in6_ifaddrhashtbl == NULL) { + panic("in6_ifaddrhashtbl allocation failed"); + } + + /* + * Generate the next largest prime greater than in6addr_nhash. + */ + k = (in6addr_nhash % 2 == 0) ? in6addr_nhash + 1 : in6addr_nhash + 2; + for (;;) { + p = 1; + for (i = 3; i * i <= k; i += 2) { + if (k % i == 0) { + p = 0; + } + } + if (p == 1) { + break; + } + k += 2; + } + in6addr_hashp = k; +} + +static int +sysctl_ip6_checkinterface SYSCTL_HANDLER_ARGS +{ +#pragma unused(arg1, arg2) + int error, i; + + i = ip6_checkinterface; + error = sysctl_handle_int(oidp, &i, 0, req); + if (error || req->newptr == USER_ADDR_NULL) { + return error; + } + + switch (i) { + case IP6_CHECKINTERFACE_WEAK_ES: + case IP6_CHECKINTERFACE_HYBRID_ES: + case IP6_CHECKINTERFACE_STRONG_ES: + if (ip6_checkinterface != i) { + ip6_checkinterface = i; + os_log(OS_LOG_DEFAULT, "%s: ip6_checkinterface is now %d\n", + __func__, ip6_checkinterface); + } + break; + default: + error = EINVAL; + break; + } + return error; }