X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0a7de7458d150b5d4dffc935ba399be265ef0a1a..HEAD:/bsd/netinet6/esp_input.c diff --git a/bsd/netinet6/esp_input.c b/bsd/netinet6/esp_input.c index 36311e312..1723ed2a5 100644 --- a/bsd/netinet6/esp_input.c +++ b/bsd/netinet6/esp_input.c @@ -58,6 +58,8 @@ * SUCH DAMAGE. */ +#define _IP_VHL + /* * RFC1827/2406 Encapsulated Security Payload. */ @@ -89,30 +91,22 @@ #include #include #include -#if INET6 +#include +#include #include -#endif -#if INET6 #include #include #include #include #include -#endif #include -#if INET6 #include -#endif #include -#if INET6 #include -#endif #include -#if INET6 #include -#endif #include #include #include @@ -133,7 +127,6 @@ extern lck_mtx_t *sadb_mutex; -#if INET #define ESPMAXLEN \ (sizeof(struct esp) < sizeof(struct newesp) \ ? sizeof(struct newesp) : sizeof(struct esp)) @@ -143,7 +136,7 @@ esp4_input_strip_udp_encap(struct mbuf *m, int iphlen) { // strip the udp header that's encapsulating ESP struct ip *ip; - size_t stripsiz = sizeof(struct udphdr); + u_int8_t stripsiz = (u_int8_t)sizeof(struct udphdr); ip = mtod(m, __typeof__(ip)); ovbcopy((caddr_t)ip, (caddr_t)(((u_char *)ip) + stripsiz), iphlen); @@ -161,7 +154,7 @@ esp6_input_strip_udp_encap(struct mbuf *m, int ip6hlen) { // strip the udp header that's encapsulating ESP struct ip6_hdr *ip6; - size_t stripsiz = sizeof(struct udphdr); + u_int8_t stripsiz = (u_int8_t)sizeof(struct udphdr); ip6 = mtod(m, __typeof__(ip6)); ovbcopy((caddr_t)ip6, (caddr_t)(((u_char *)ip6) + stripsiz), ip6hlen); @@ -174,6 +167,40 @@ esp6_input_strip_udp_encap(struct mbuf *m, int ip6hlen) return ip6; } +static void +esp_input_log(struct mbuf *m, struct secasvar *sav, u_int32_t spi, u_int32_t seq) +{ + if (net_mpklog_enabled && + (sav->sah->ipsec_if->if_xflags & IFXF_MPK_LOG) == IFXF_MPK_LOG) { + struct tcphdr th = {}; + u_int32_t proto_len = 0; + u_int8_t iphlen = 0; + u_int8_t proto = 0; + + struct ip *inner_ip = mtod(m, struct ip *); + if (IP_VHL_V(inner_ip->ip_vhl) == 4) { + iphlen = (u_int8_t)(IP_VHL_HL(inner_ip->ip_vhl) << 2); + proto = inner_ip->ip_p; + } else if (IP_VHL_V(inner_ip->ip_vhl) == 6) { + struct ip6_hdr *inner_ip6 = mtod(m, struct ip6_hdr *); + iphlen = sizeof(struct ip6_hdr); + proto = inner_ip6->ip6_nxt; + } + + if (proto == IPPROTO_TCP) { + if ((int)(iphlen + sizeof(th)) <= m->m_pkthdr.len) { + m_copydata(m, iphlen, sizeof(th), (u_int8_t *)&th); + } + + proto_len = m->m_pkthdr.len - iphlen - (th.th_off << 2); + MPKL_ESP_INPUT_TCP(esp_mpkl_log_object, + ntohl(spi), seq, + ntohs(th.th_sport), ntohs(th.th_dport), + ntohl(th.th_seq), proto_len); + } + } +} + void esp4_input(struct mbuf *m, int off) { @@ -184,9 +211,7 @@ struct mbuf * esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) { struct ip *ip; -#if INET6 struct ip6_hdr *ip6; -#endif /* INET6 */ struct esp *esp; struct esptail esptail; u_int32_t spi; @@ -196,10 +221,11 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) u_int16_t nxt; const struct esp_algorithm *algo; int ivlen; - size_t hlen; size_t esplen; + u_int8_t hlen; sa_family_t ifamily; struct mbuf *out_m = NULL; + mbuf_traffic_class_t traffic_class = 0; KERNEL_DEBUG(DBG_FNC_ESPIN | DBG_FUNC_START, 0, 0, 0, 0, 0); /* sanity check for alignment. */ @@ -236,7 +262,7 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) } esp = (struct esp *)(void *)(((u_int8_t *)ip) + off); #ifdef _IP_VHL - hlen = IP_VHL_HL(ip->ip_vhl) << 2; + hlen = (u_int8_t)(IP_VHL_HL(ip->ip_vhl) << 2); #else hlen = ip->ip_hl << 2; #endif @@ -248,8 +274,8 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) (caddr_t)&ip->ip_src, (caddr_t)&ip->ip_dst, IPPROTO_ESP, spi, interface)) == 0) { ipseclog((LOG_WARNING, - "IPv4 ESP input: no key association found for spi %u\n", - (u_int32_t)ntohl(spi))); + "IPv4 ESP input: no key association found for spi %u (0x%08x)\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi))); IPSEC_STAT_INCREMENT(ipsecstat.in_nosa); goto bad; } @@ -259,16 +285,16 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) if (sav->state != SADB_SASTATE_MATURE && sav->state != SADB_SASTATE_DYING) { ipseclog((LOG_DEBUG, - "IPv4 ESP input: non-mature/dying SA found for spi %u\n", - (u_int32_t)ntohl(spi))); + "IPv4 ESP input: non-mature/dying SA found for spi %u (0x%08x)\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi))); IPSEC_STAT_INCREMENT(ipsecstat.in_badspi); goto bad; } algo = esp_algorithm_lookup(sav->alg_enc); if (!algo) { ipseclog((LOG_DEBUG, "IPv4 ESP input: " - "unsupported encryption algorithm for spi %u\n", - (u_int32_t)ntohl(spi))); + "unsupported encryption algorithm for spi %u (0x%08x)\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi))); IPSEC_STAT_INCREMENT(ipsecstat.in_badspi); goto bad; } @@ -284,17 +310,24 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) seq = ntohl(((struct newesp *)esp)->esp_seq); + if ((sav->flags2 & SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) == + SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) { + u_int8_t dscp = ip->ip_tos >> IPTOS_DSCP_SHIFT; + traffic_class = rfc4594_dscp_to_tc(dscp); + } + /* Save ICV from packet for verification later */ size_t siz = 0; unsigned char saved_icv[AH_MAXSUMSIZE]; if (algo->finalizedecrypt) { siz = algo->icvlen; - m_copydata(m, m->m_pkthdr.len - siz, siz, (caddr_t) saved_icv); + VERIFY(siz <= USHRT_MAX); + m_copydata(m, m->m_pkthdr.len - (u_short)siz, (u_short)siz, (caddr_t) saved_icv); goto delay_icv; } - if (!((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay - && (sav->alg_auth && sav->key_auth))) { + if (!((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay[traffic_class] != NULL && + (sav->alg_auth && sav->key_auth))) { goto noreplaycheck; } @@ -306,7 +339,8 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) /* * check for sequence number. */ - if (ipsec_chkreplay(seq, sav)) { + _CASSERT(MBUF_TC_MAX <= UINT8_MAX); + if (ipsec_chkreplay(seq, sav, (u_int8_t)traffic_class)) { ; /*okey*/ } else { IPSEC_STAT_INCREMENT(ipsecstat.in_espreplay); @@ -333,13 +367,13 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) } if (AH_MAXSUMSIZE < siz) { ipseclog((LOG_DEBUG, - "internal error: AH_MAXSUMSIZE must be larger than %lu\n", + "internal error: AH_MAXSUMSIZE must be larger than %u\n", (u_int32_t)siz)); IPSEC_STAT_INCREMENT(ipsecstat.in_inval); goto bad; } - m_copydata(m, m->m_pkthdr.len - siz, siz, (caddr_t) &sum0[0]); + m_copydata(m, m->m_pkthdr.len - (int)siz, (int)siz, (caddr_t) &sum0[0]); if (esp_auth(m, off, m->m_pkthdr.len - off - siz, sav, sum)) { ipseclog((LOG_WARNING, "auth fail in IPv4 ESP input: %s %s\n", @@ -358,10 +392,10 @@ esp4_input_extended(struct mbuf *m, int off, ifnet_t interface) delay_icv: /* strip off the authentication data */ - m_adj(m, -siz); + m_adj(m, (int)-siz); ip = mtod(m, struct ip *); #ifdef IPLEN_FLIPPED - ip->ip_len = ip->ip_len - siz; + ip->ip_len = ip->ip_len - (u_short)siz; #else ip->ip_len = htons(ntohs(ip->ip_len) - siz); #endif @@ -372,8 +406,8 @@ delay_icv: /* * update sequence number. */ - if ((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay) { - if (ipsec_updatereplay(seq, sav)) { + if ((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay[traffic_class] != NULL) { + if (ipsec_updatereplay(seq, sav, (u_int8_t)traffic_class)) { IPSEC_STAT_INCREMENT(ipsecstat.in_espreplay); goto bad; } @@ -402,7 +436,7 @@ noreplaycheck: } if (m->m_len < off + esplen + ivlen) { - m = m_pullup(m, off + esplen + ivlen); + m = m_pullup(m, (int)(off + esplen + ivlen)); if (!m) { ipseclog((LOG_DEBUG, "IPv4 ESP input: can't pullup in esp4_input\n")); @@ -442,7 +476,7 @@ noreplaycheck: if (algo->finalizedecrypt) { if ((*algo->finalizedecrypt)(sav, saved_icv, algo->icvlen)) { - ipseclog((LOG_ERR, "packet decryption ICV failure\n")); + ipseclog((LOG_ERR, "esp4 packet decryption ICV failure\n")); IPSEC_STAT_INCREMENT(ipsecstat.in_inval); KERNEL_DEBUG(DBG_FNC_DECRYPT | DBG_FUNC_END, 1, 0, 0, 0, 0); goto bad; @@ -467,10 +501,10 @@ noreplaycheck: } /* strip off the trailing pad area. */ - m_adj(m, -taillen); + m_adj(m, (int)-taillen); ip = mtod(m, struct ip *); #ifdef IPLEN_FLIPPED - ip->ip_len = ip->ip_len - taillen; + ip->ip_len = ip->ip_len - (u_short)taillen; #else ip->ip_len = htons(ntohs(ip->ip_len) - taillen); #endif @@ -484,6 +518,7 @@ noreplaycheck: IPSEC_STAT_INCREMENT(ipsecstat.in_inval); goto bad; } + ip = mtod(m, struct ip *); } // check the UDP encap header to detect changes in the source port, and then strip the header @@ -491,8 +526,8 @@ noreplaycheck: // if peer is behind nat and this is the latest esp packet if ((sav->flags & SADB_X_EXT_NATT_DETECTED_PEER) != 0 && (sav->flags & SADB_X_EXT_OLD) == 0 && - seq && sav->replay && - seq >= sav->replay->lastseq) { + seq && sav->replay[traffic_class] && + seq >= sav->replay[traffic_class]->lastseq) { struct udphdr *encap_uh = (__typeof__(encap_uh))(void *)((caddr_t)ip + off); if (encap_uh->uh_sport && ntohs(encap_uh->uh_sport) != sav->remote_ike_port) { @@ -504,7 +539,7 @@ noreplaycheck: } /* was it transmitted over the IPsec tunnel SA? */ - if (ipsec4_tunnel_validate(m, off + esplen + ivlen, nxt, sav, &ifamily)) { + if (ipsec4_tunnel_validate(m, (int)(off + esplen + ivlen), nxt, sav, &ifamily)) { ifaddr_t ifa; struct sockaddr_storage addr; @@ -519,7 +554,7 @@ noreplaycheck: int sum; tos = ip->ip_tos; - m_adj(m, off + esplen + ivlen); + m_adj(m, (int)(off + esplen + ivlen)); if (ifamily == AF_INET) { struct sockaddr_in *ipaddr; @@ -561,7 +596,6 @@ noreplaycheck: ipaddr->sin_family = AF_INET; ipaddr->sin_len = sizeof(*ipaddr); ipaddr->sin_addr = ip->ip_dst; -#if INET6 } else if (ifamily == AF_INET6) { struct sockaddr_in6 *ip6addr; @@ -605,7 +639,6 @@ noreplaycheck: ip6addr->sin6_family = AF_INET6; ip6addr->sin6_len = sizeof(*ip6addr); ip6addr->sin6_addr = ip6->ip6_dst; -#endif /* INET6 */ } else { ipseclog((LOG_ERR, "ipsec tunnel unsupported address family " "in ESP input\n")); @@ -629,16 +662,30 @@ noreplaycheck: /* Clear the csum flags, they can't be valid for the inner headers */ m->m_pkthdr.csum_flags = 0; - // Input via IPSec interface - if (sav->sah->ipsec_if != NULL) { + // Input via IPsec interface + lck_mtx_lock(sadb_mutex); + ifnet_t ipsec_if = sav->sah->ipsec_if; + if (ipsec_if != NULL) { + // If an interface is found, add a reference count before dropping the lock + ifnet_reference(ipsec_if); + } + lck_mtx_unlock(sadb_mutex); + if (ipsec_if != NULL) { + esp_input_log(m, sav, spi, seq); + ipsec_save_wake_packet(m, ntohl(spi), seq); + // Return mbuf if (interface != NULL && - interface == sav->sah->ipsec_if) { + interface == ipsec_if) { out_m = m; + ifnet_release(ipsec_if); goto done; } - if (ipsec_inject_inbound_packet(sav->sah->ipsec_if, m) == 0) { + errno_t inject_error = ipsec_inject_inbound_packet(ipsec_if, m); + ifnet_release(ipsec_if); + + if (inject_error == 0) { m = NULL; goto done; } else { @@ -670,11 +717,11 @@ noreplaycheck: ip = mtod(m, struct ip *); #ifdef IPLEN_FLIPPED - ip->ip_len = ip->ip_len - stripsiz; + ip->ip_len = ip->ip_len - (u_short)stripsiz; #else ip->ip_len = htons(ntohs(ip->ip_len) - stripsiz); #endif - ip->ip_p = nxt; + ip->ip_p = (u_int8_t)nxt; key_sa_recordxfer(sav, m); if (ipsec_addhist(m, IPPROTO_ESP, spi) != 0) { @@ -741,13 +788,21 @@ noreplaycheck: struct ip *, ip, struct ip6_hdr *, NULL); // Input via IPsec interface legacy path - if (sav->sah->ipsec_if != NULL) { + lck_mtx_lock(sadb_mutex); + ifnet_t ipsec_if = sav->sah->ipsec_if; + if (ipsec_if != NULL) { + // If an interface is found, add a reference count before dropping the lock + ifnet_reference(ipsec_if); + } + lck_mtx_unlock(sadb_mutex); + if (ipsec_if != NULL) { int mlen; if ((mlen = m_length2(m, NULL)) < hlen) { ipseclog((LOG_DEBUG, - "IPv4 ESP input: decrypted packet too short %d < %d\n", + "IPv4 ESP input: decrypted packet too short %d < %u\n", mlen, hlen)); IPSEC_STAT_INCREMENT(ipsecstat.in_inval); + ifnet_release(ipsec_if); goto bad; } ip->ip_len = htons(ip->ip_len + hlen); @@ -755,14 +810,21 @@ noreplaycheck: ip->ip_sum = 0; ip->ip_sum = ip_cksum_hdr_in(m, hlen); + esp_input_log(m, sav, spi, seq); + ipsec_save_wake_packet(m, ntohl(spi), seq); + // Return mbuf if (interface != NULL && - interface == sav->sah->ipsec_if) { + interface == ipsec_if) { out_m = m; + ifnet_release(ipsec_if); goto done; } - if (ipsec_inject_inbound_packet(sav->sah->ipsec_if, m) == 0) { + errno_t inject_error = ipsec_inject_inbound_packet(ipsec_if, m); + ifnet_release(ipsec_if); + + if (inject_error == 0) { m = NULL; goto done; } else { @@ -770,7 +832,7 @@ noreplaycheck: } } - ip_proto_dispatch_in(m, off, nxt, 0); + ip_proto_dispatch_in(m, off, (u_int8_t)nxt, 0); } else { m_freem(m); } @@ -799,9 +861,6 @@ bad: KERNEL_DEBUG(DBG_FNC_ESPIN | DBG_FUNC_END, 4, 0, 0, 0, 0); return out_m; } -#endif /* INET */ - -#if INET6 int esp6_input(struct mbuf **mp, int *offp, int proto) @@ -822,13 +881,14 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) u_int32_t spi; u_int32_t seq; struct secasvar *sav = NULL; - size_t taillen; u_int16_t nxt; char *nproto; const struct esp_algorithm *algo; int ivlen; size_t esplen; + u_int16_t taillen; sa_family_t ifamily; + mbuf_traffic_class_t traffic_class = 0; /* sanity check for alignment. */ if (off % 4 != 0 || m->m_pkthdr.len % 4 != 0) { @@ -877,8 +937,19 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) (caddr_t)&ip6->ip6_src, (caddr_t)&ip6->ip6_dst, IPPROTO_ESP, spi, interface)) == 0) { ipseclog((LOG_WARNING, - "IPv6 ESP input: no key association found for spi %u\n", - (u_int32_t)ntohl(spi))); + "IPv6 ESP input: no key association found for spi %u (0x%08x) seq %u" + " src %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" + " dst %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x if %s\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi), ntohl(((struct newesp *)esp)->esp_seq), + ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[0]), ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[1]), + ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[2]), ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[3]), + ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[4]), ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[5]), + ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[6]), ntohs(ip6->ip6_src.__u6_addr.__u6_addr16[7]), + ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[0]), ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[1]), + ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[2]), ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[3]), + ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[4]), ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[5]), + ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[6]), ntohs(ip6->ip6_dst.__u6_addr.__u6_addr16[7]), + ((interface != NULL) ? if_name(interface) : "NONE"))); IPSEC_STAT_INCREMENT(ipsec6stat.in_nosa); goto bad; } @@ -888,16 +959,16 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) if (sav->state != SADB_SASTATE_MATURE && sav->state != SADB_SASTATE_DYING) { ipseclog((LOG_DEBUG, - "IPv6 ESP input: non-mature/dying SA found for spi %u\n", - (u_int32_t)ntohl(spi))); + "IPv6 ESP input: non-mature/dying SA found for spi %u (0x%08x)\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi))); IPSEC_STAT_INCREMENT(ipsec6stat.in_badspi); goto bad; } algo = esp_algorithm_lookup(sav->alg_enc); if (!algo) { ipseclog((LOG_DEBUG, "IPv6 ESP input: " - "unsupported encryption algorithm for spi %u\n", - (u_int32_t)ntohl(spi))); + "unsupported encryption algorithm for spi %u (0x%08x)\n", + (u_int32_t)ntohl(spi), (u_int32_t)ntohl(spi))); IPSEC_STAT_INCREMENT(ipsec6stat.in_badspi); goto bad; } @@ -913,17 +984,25 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) seq = ntohl(((struct newesp *)esp)->esp_seq); + if ((sav->flags2 & SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) == + SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) { + u_int8_t dscp = (ntohl(ip6->ip6_flow) & IP6FLOW_DSCP_MASK) >> IP6FLOW_DSCP_SHIFT; + traffic_class = rfc4594_dscp_to_tc(dscp); + } + /* Save ICV from packet for verification later */ size_t siz = 0; unsigned char saved_icv[AH_MAXSUMSIZE]; if (algo->finalizedecrypt) { siz = algo->icvlen; - m_copydata(m, m->m_pkthdr.len - siz, siz, (caddr_t) saved_icv); + VERIFY(siz <= UINT16_MAX); + m_copydata(m, m->m_pkthdr.len - (int)siz, (int)siz, (caddr_t) saved_icv); goto delay_icv; } - if (!((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay - && (sav->alg_auth && sav->key_auth))) { + if (!((sav->flags & SADB_X_EXT_OLD) == 0 && + sav->replay[traffic_class] != NULL && + (sav->alg_auth && sav->key_auth))) { goto noreplaycheck; } @@ -935,7 +1014,7 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) /* * check for sequence number. */ - if (ipsec_chkreplay(seq, sav)) { + if (ipsec_chkreplay(seq, sav, (u_int8_t)traffic_class)) { ; /*okey*/ } else { IPSEC_STAT_INCREMENT(ipsec6stat.in_espreplay); @@ -962,13 +1041,13 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) } if (AH_MAXSUMSIZE < siz) { ipseclog((LOG_DEBUG, - "internal error: AH_MAXSUMSIZE must be larger than %lu\n", + "internal error: AH_MAXSUMSIZE must be larger than %u\n", (u_int32_t)siz)); IPSEC_STAT_INCREMENT(ipsec6stat.in_inval); goto bad; } - m_copydata(m, m->m_pkthdr.len - siz, siz, (caddr_t) &sum0[0]); + m_copydata(m, m->m_pkthdr.len - (int)siz, (int)siz, (caddr_t) &sum0[0]); if (esp_auth(m, off, m->m_pkthdr.len - off - siz, sav, sum)) { ipseclog((LOG_WARNING, "auth fail in IPv6 ESP input: %s %s\n", @@ -987,9 +1066,9 @@ esp6_input_extended(struct mbuf **mp, int *offp, int proto, ifnet_t interface) delay_icv: /* strip off the authentication data */ - m_adj(m, -siz); + m_adj(m, (int)-siz); ip6 = mtod(m, struct ip6_hdr *); - ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - siz); + ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - (u_int16_t)siz); m->m_flags |= M_AUTHIPDGM; IPSEC_STAT_INCREMENT(ipsec6stat.in_espauthsucc); @@ -998,8 +1077,8 @@ delay_icv: /* * update sequence number. */ - if ((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay) { - if (ipsec_updatereplay(seq, sav)) { + if ((sav->flags & SADB_X_EXT_OLD) == 0 && sav->replay[traffic_class] != NULL) { + if (ipsec_updatereplay(seq, sav, (u_int8_t)traffic_class)) { IPSEC_STAT_INCREMENT(ipsec6stat.in_espreplay); goto bad; } @@ -1028,7 +1107,7 @@ noreplaycheck: } #ifndef PULLDOWN_TEST - IP6_EXTHDR_CHECK(m, off, esplen + ivlen, return IPPROTO_DONE); /*XXX*/ + IP6_EXTHDR_CHECK(m, off, (int)(esplen + ivlen), return IPPROTO_DONE); /*XXX*/ #else IP6_EXTHDR_GET(esp, struct esp *, m, off, esplen + ivlen); if (esp == NULL) { @@ -1067,7 +1146,7 @@ noreplaycheck: if (algo->finalizedecrypt) { if ((*algo->finalizedecrypt)(sav, saved_icv, algo->icvlen)) { - ipseclog((LOG_ERR, "packet decryption ICV failure\n")); + ipseclog((LOG_ERR, "esp6 packet decryption ICV failure\n")); IPSEC_STAT_INCREMENT(ipsecstat.in_inval); KERNEL_DEBUG(DBG_FNC_DECRYPT | DBG_FUNC_END, 1, 0, 0, 0, 0); goto bad; @@ -1106,6 +1185,7 @@ noreplaycheck: IPSEC_STAT_INCREMENT(ipsec6stat.in_inval); goto bad; } + ip6 = mtod(m, struct ip6_hdr *); } // check the UDP encap header to detect changes in the source port, and then strip the header @@ -1113,8 +1193,8 @@ noreplaycheck: // if peer is behind nat and this is the latest esp packet if ((sav->flags & SADB_X_EXT_NATT_DETECTED_PEER) != 0 && (sav->flags & SADB_X_EXT_OLD) == 0 && - seq && sav->replay && - seq >= sav->replay->lastseq) { + seq && sav->replay[traffic_class] && + seq >= sav->replay[traffic_class]->lastseq) { struct udphdr *encap_uh = (__typeof__(encap_uh))(void *)((caddr_t)ip6 + off); if (encap_uh->uh_sport && ntohs(encap_uh->uh_sport) != sav->remote_ike_port) { @@ -1127,7 +1207,7 @@ noreplaycheck: /* was it transmitted over the IPsec tunnel SA? */ - if (ipsec6_tunnel_validate(m, off + esplen + ivlen, nxt, sav, &ifamily)) { + if (ipsec6_tunnel_validate(m, (int)(off + esplen + ivlen), nxt, sav, &ifamily)) { ifaddr_t ifa; struct sockaddr_storage addr; @@ -1140,7 +1220,7 @@ noreplaycheck: */ u_int32_t flowinfo; /*net endian*/ flowinfo = ip6->ip6_flow; - m_adj(m, off + esplen + ivlen); + m_adj(m, (int)(off + esplen + ivlen)); if (ifamily == AF_INET6) { struct sockaddr_in6 *ip6addr; @@ -1240,15 +1320,29 @@ noreplaycheck: IFA_REMREF(ifa); } - // Input via IPSec interface - if (sav->sah->ipsec_if != NULL) { + // Input via IPsec interface + lck_mtx_lock(sadb_mutex); + ifnet_t ipsec_if = sav->sah->ipsec_if; + if (ipsec_if != NULL) { + // If an interface is found, add a reference count before dropping the lock + ifnet_reference(ipsec_if); + } + lck_mtx_unlock(sadb_mutex); + if (ipsec_if != NULL) { + esp_input_log(m, sav, spi, seq); + ipsec_save_wake_packet(m, ntohl(spi), seq); + // Return mbuf if (interface != NULL && - interface == sav->sah->ipsec_if) { + interface == ipsec_if) { + ifnet_release(ipsec_if); goto done; } - if (ipsec_inject_inbound_packet(sav->sah->ipsec_if, m) == 0) { + errno_t inject_error = ipsec_inject_inbound_packet(ipsec_if, m); + ifnet_release(ipsec_if); + + if (inject_error == 0) { m = NULL; nxt = IPPROTO_DONE; goto done; @@ -1267,16 +1361,17 @@ noreplaycheck: * even in m_pulldown case, we need to strip off ESP so that * we can always compute checksum for AH correctly. */ - size_t stripsiz; + u_int16_t stripsiz; char *prvnxtp; /* * Set the next header field of the previous header correctly. */ prvnxtp = ip6_get_prevhdr(m, off); /* XXX */ - *prvnxtp = nxt; + *prvnxtp = (u_int8_t)nxt; - stripsiz = esplen + ivlen; + VERIFY(esplen + ivlen <= UINT16_MAX); + stripsiz = (u_int16_t)(esplen + ivlen); ip6 = mtod(m, struct ip6_hdr *); if (m->m_len >= stripsiz + off) { @@ -1348,7 +1443,6 @@ noreplaycheck: m = n; } #endif - ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - stripsiz); @@ -1370,15 +1464,29 @@ noreplaycheck: _CASSERT(offsetof(struct pkthdr, csum_data) == offsetof(struct pkthdr, csum_rx_val)); } - // Input via IPSec interface - if (sav->sah->ipsec_if != NULL) { + // Input via IPsec interface + lck_mtx_lock(sadb_mutex); + ifnet_t ipsec_if = sav->sah->ipsec_if; + if (ipsec_if != NULL) { + // If an interface is found, add a reference count before dropping the lock + ifnet_reference(ipsec_if); + } + lck_mtx_unlock(sadb_mutex); + if (ipsec_if != NULL) { + esp_input_log(m, sav, spi, seq); + ipsec_save_wake_packet(m, ntohl(spi), seq); + // Return mbuf if (interface != NULL && - interface == sav->sah->ipsec_if) { + interface == ipsec_if) { + ifnet_release(ipsec_if); goto done; } - if (ipsec_inject_inbound_packet(sav->sah->ipsec_if, m) == 0) { + errno_t inject_error = ipsec_inject_inbound_packet(ipsec_if, m); + ifnet_release(ipsec_if); + + if (inject_error == 0) { m = NULL; nxt = IPPROTO_DONE; goto done; @@ -1523,4 +1631,3 @@ esp6_ctlinput(int cmd, struct sockaddr *sa, void *d, __unused struct ifnet *ifp) /* we normally notify any pcb here */ } } -#endif /* INET6 */