/*
- * Copyright (c) 2008-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2013 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
+#include <sys/mcache.h>
#include <sys/domain.h>
#include <sys/protosw.h>
#include <sys/socket.h>
extern lck_mtx_t *sadb_mutex;
#if INET
-extern struct protosw inetsw[];
-
#define ESPMAXLEN \
(sizeof(struct esp) < sizeof(struct newesp) \
? sizeof(struct newesp) : sizeof(struct esp))
}
}
+ /* Expect 32-bit aligned data pointer on strict-align platforms */
+ MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
ip = mtod(m, struct ip *);
// expect udp-encap and esp packets only
if (ip->ip_p != IPPROTO_ESP &&
IPSEC_STAT_INCREMENT(ipsecstat.in_inval);
goto bad;
}
- esp = (struct esp *)(((u_int8_t *)ip) + off);
+ esp = (struct esp *)(void *)(((u_int8_t *)ip) + off);
#ifdef _IP_VHL
hlen = IP_VHL_HL(ip->ip_vhl) << 2;
#else
goto bad;
}
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp4_input called to allocate SA:%p\n", sav));
+ printf("DP esp4_input called to allocate SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
if (sav->state != SADB_SASTATE_MATURE
&& sav->state != SADB_SASTATE_DYING) {
ipseclog((LOG_DEBUG,
/* check ICV */
{
- u_char sum0[AH_MAXSUMSIZE];
- u_char sum[AH_MAXSUMSIZE];
+ u_char sum0[AH_MAXSUMSIZE] __attribute__((aligned(4)));
+ u_char sum[AH_MAXSUMSIZE] __attribute__((aligned(4)));
const struct ah_algorithm *sumalgo;
size_t siz;
(sav->flags & SADB_X_EXT_OLD) == 0 &&
seq && sav->replay &&
seq >= sav->replay->lastseq) {
- struct udphdr *encap_uh = (__typeof__(encap_uh))((caddr_t)ip + off);
+ struct udphdr *encap_uh = (__typeof__(encap_uh))(void *)((caddr_t)ip + off);
if (encap_uh->uh_sport &&
- encap_uh->uh_sport != sav->remote_ike_port) {
- sav->remote_ike_port = encap_uh->uh_sport;
+ ntohs(encap_uh->uh_sport) != sav->remote_ike_port) {
+ sav->remote_ike_port = ntohs(encap_uh->uh_sport);
}
}
ip = esp4_input_strip_UDP_encap(m, off);
- esp = (struct esp *)(((u_int8_t *)ip) + off);
+ esp = (struct esp *)(void *)(((u_int8_t *)ip) + off);
+ }
+
+ if (sav->utun_is_keepalive_fn) {
+ if (sav->utun_is_keepalive_fn(sav->utun_pcb, &m, nxt, sav->flags, (off + esplen + ivlen))) {
+ if (m) {
+ // not really bad, we just wanna exit
+ IPSEC_STAT_INCREMENT(ipsecstat.in_success);
+ m = NULL;
+ }
+ goto bad;
+ }
}
/* was it transmitted over the IPsec tunnel SA? */
}
}
+ /*
+ * Expect 32-bit aligned data pointer on strict-align
+ * platforms.
+ */
+ MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
ip6 = mtod(m, struct ip6_hdr *);
/* ECN consideration. */
/* Clear the csum flags, they can't be valid for the inner headers */
m->m_pkthdr.csum_flags = 0;
+
+ if (sav->utun_in_fn) {
+ if (!(sav->utun_in_fn(sav->utun_pcb, &m, ifamily == AF_INET ? PF_INET : PF_INET6))) {
+ m = NULL;
+ // we just wanna exit since packet has been completely processed
+ goto bad;
+ }
+ }
+
if (proto_input(ifamily == AF_INET ? PF_INET : PF_INET6, m) != 0)
goto bad;
}
ip = mtod(m, struct ip *);
}
- udp = (struct udphdr *)(((u_int8_t *)ip) + off);
+ udp = (struct udphdr *)(void *)(((u_int8_t *)ip) + off);
lck_mtx_lock(sadb_mutex);
if (sav->natt_encapsulated_src_port == 0) {
struct ip *, ip, struct ifnet *, m->m_pkthdr.rcvif,
struct ip *, ip, struct ip6_hdr *, NULL);
+ if (sav->utun_in_fn) {
+ if (!(sav->utun_in_fn(sav->utun_pcb, &m, PF_INET))) {
+ m = NULL;
+ // we just wanna exit since packet has been completely processed
+ goto bad;
+ }
+ }
+
ip_proto_dispatch_in(m, off, nxt, 0);
} else
m_freem(m);
if (sav) {
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp4_input call free SA:%p\n", sav));
+ printf("DP esp4_input call free SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
key_freesav(sav, KEY_SADB_UNLOCKED);
}
IPSEC_STAT_INCREMENT(ipsecstat.in_success);
bad:
if (sav) {
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp4_input call free SA:%p\n", sav));
+ printf("DP esp4_input call free SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
key_freesav(sav, KEY_SADB_UNLOCKED);
}
if (m)
#ifndef PULLDOWN_TEST
IP6_EXTHDR_CHECK(m, off, ESPMAXLEN, {return IPPROTO_DONE;});
- esp = (struct esp *)(mtod(m, caddr_t) + off);
+ esp = (struct esp *)(void *)(mtod(m, caddr_t) + off);
#else
IP6_EXTHDR_GET(esp, struct esp *, m, off, ESPMAXLEN);
if (esp == NULL) {
return IPPROTO_DONE;
}
#endif
+ /* Expect 32-bit data aligned pointer on strict-align platforms */
+ MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
ip6 = mtod(m, struct ip6_hdr *);
if (ntohs(ip6->ip6_plen) == 0) {
goto bad;
}
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp6_input called to allocate SA:%p\n", sav));
+ printf("DP esp6_input called to allocate SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
if (sav->state != SADB_SASTATE_MATURE
&& sav->state != SADB_SASTATE_DYING) {
ipseclog((LOG_DEBUG,
/* check ICV */
{
- u_char sum0[AH_MAXSUMSIZE];
- u_char sum[AH_MAXSUMSIZE];
+ u_char sum0[AH_MAXSUMSIZE] __attribute__((aligned(4)));
+ u_char sum[AH_MAXSUMSIZE] __attribute__((aligned(4)));
const struct ah_algorithm *sumalgo;
size_t siz;
ip6 = mtod(m, struct ip6_hdr *);
ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - taillen);
+ if (sav->utun_is_keepalive_fn) {
+ if (sav->utun_is_keepalive_fn(sav->utun_pcb, &m, nxt, sav->flags, (off + esplen + ivlen))) {
+ if (m) {
+ // not really bad, we just wanna exit
+ IPSEC_STAT_INCREMENT(ipsec6stat.in_success);
+ m = NULL;
+ }
+ goto bad;
+ }
+ }
+
/* was it transmitted over the IPsec tunnel SA? */
if (ipsec6_tunnel_validate(m, off + esplen + ivlen, nxt, sav)) {
ifaddr_t ifa;
}
}
+ if (sav->utun_in_fn) {
+ if (!(sav->utun_in_fn(sav->utun_pcb, &m, PF_INET6))) {
+ m = NULL;
+ // we just wanna exit since packet has been completely processed
+ goto bad;
+ }
+ }
+
if (proto_input(PF_INET6, m) != 0)
goto bad;
nxt = IPPROTO_DONE;
IPSEC_STAT_INCREMENT(ipsec6stat.in_nomem);
goto bad;
}
+
+ if (sav->utun_in_fn) {
+ if (!(sav->utun_in_fn(sav->utun_pcb, &m, PF_INET6))) {
+ m = NULL;
+ // we just wanna exit since packet has been completely processed
+ goto bad;
+ }
+ }
}
*offp = off;
if (sav) {
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp6_input call free SA:%p\n", sav));
+ printf("DP esp6_input call free SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
key_freesav(sav, KEY_SADB_UNLOCKED);
}
IPSEC_STAT_INCREMENT(ipsec6stat.in_success);
bad:
if (sav) {
KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
- printf("DP esp6_input call free SA:%p\n", sav));
+ printf("DP esp6_input call free SA:0x%llx\n",
+ (uint64_t)VM_KERNEL_ADDRPERM(sav)));
key_freesav(sav, KEY_SADB_UNLOCKED);
}
if (m)
m_copydata(m, off, sizeof(esp), (caddr_t)&esp);
espp = &esp;
} else
- espp = (struct newesp*)(mtod(m, caddr_t) + off);
+ espp = (struct newesp*)(void *)(mtod(m, caddr_t) + off);
if (cmd == PRC_MSGSIZE) {
int valid = 0;
* the address in the ICMP message payload.
*/
sa6_src = ip6cp->ip6c_src;
- sa6_dst = (struct sockaddr_in6 *)sa;
+ sa6_dst = (struct sockaddr_in6 *)(void *)sa;
sav = key_allocsa(AF_INET6,
(caddr_t)&sa6_src->sin6_addr,
(caddr_t)&sa6_dst->sin6_addr,
projects / apple / xnu.git / blobdiff