xnu-2782.30.5.tar.gz

[apple/xnu.git] / bsd / netinet6 / ipcomp_input.c

diff --git a/bsd/netinet6/ipcomp_input.c b/bsd/netinet6/ipcomp_input.c
index c9473dd8bf722b64ff043f826cc4e61921dffbb2..c3b33030576d09d633828465d9e72e3a76011b8e 100644 (file)
--- a/bsd/netinet6/ipcomp_input.c
+++ b/bsd/netinet6/ipcomp_input.c
@@ -39,6 +39,7 @@
 #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>
@@ -78,6 +79,7 @@
 #include <netkey/keydb.h>
 
 #include <net/net_osdep.h>
+#include <mach/sdt.h>
 
 #define IPLEN_FLIPPED
 
@@ -95,7 +97,6 @@ ipcomp4_input(struct mbuf *m, int off)
        size_t newlen, olen;
        struct secasvar *sav = NULL;
 
-
        if (m->m_pkthdr.len < off + sizeof(struct ipcomp)) {
                ipseclog((LOG_DEBUG, "IPv4 IPComp input: assumption failed "
                    "(packet too short)\n"));
@@ -112,6 +113,10 @@ ipcomp4_input(struct mbuf *m, int off)
                goto fail;
        }
        ipcomp = mtod(md, struct ipcomp *);
+
+       /* Expect 32-bit aligned data pointer on strict-align platforms */
+       MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
        ip = mtod(m, struct ip *);
        nxt = ipcomp->comp_nxt;
 #ifdef _IP_VHL
@@ -214,6 +219,11 @@ ipcomp4_input(struct mbuf *m, int off)
                        IPSEC_STAT_INCREMENT(ipsecstat.in_polvio);
                        goto fail;
                }
+
+               DTRACE_IP6(receive, struct mbuf *, m, struct inpcb *, NULL,
+                        struct ip *, ip, struct ifnet *, m->m_pkthdr.rcvif,
+                        struct ip *, ip, struct ip6_hdr *, NULL);
+
                ip_proto_dispatch_in(m, off, nxt, 0);
        } else
                m_freem(m);
@@ -233,10 +243,9 @@ fail:
 
 #if INET6
 int
-ipcomp6_input(mp, offp)
-       struct mbuf **mp;
-       int *offp;
+ipcomp6_input(struct mbuf **mp, int *offp, int proto)
 {
+#pragma unused(proto)
        struct mbuf *m, *md;
        int off;
        struct ip6_hdr *ip6;
@@ -261,6 +270,10 @@ ipcomp6_input(mp, offp)
                goto fail;
        }
        ipcomp = mtod(md, struct ipcomp *);
+
+       /* Expect 32-bit aligned data pointer on strict-align platforms */
+       MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
        ip6 = mtod(m, struct ip6_hdr *);
        nxt = ipcomp->comp_nxt;