xnu-2050.18.24.tar.gz

[apple/xnu.git] / bsd / netinet / ip_icmp.c

diff --git a/bsd/netinet/ip_icmp.c b/bsd/netinet/ip_icmp.c
index 7f55b2a5f09886c24db83c7a69e744dbb46b025f..5760672478de6c0500a3dfd5ecca2368468a2172 100644 (file)
--- a/bsd/netinet/ip_icmp.c
+++ b/bsd/netinet/ip_icmp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -69,6 +69,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>

+#include <sys/mcache.h>

 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/time.h>


@@ -98,11 +99,6 @@
 #if IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
 #if IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>

-#endif
-
-#if defined(NFAITH) && NFAITH > 0
-#include "faith.h"
-#include <net/if_types.h>

 #endif
 
  /* XXX This one should go in sys/mbuf.h. It is used to avoid that
 #endif
 
  /* XXX This one should go in sys/mbuf.h. It is used to avoid that


@@ -124,49 +120,59 @@
  */
 
 struct icmpstat icmpstat;
  */
 
 struct icmpstat icmpstat;

-SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD,
+SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD | CTLFLAG_LOCKED,

        &icmpstat, icmpstat, "");
 
 static int     icmpmaskrepl = 0;
        &icmpstat, icmpstat, "");
 
 static int     icmpmaskrepl = 0;

-SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW | CTLFLAG_LOCKED,

        &icmpmaskrepl, 0, "");
 
 static int     icmptimestamp = 0;
        &icmpmaskrepl, 0, "");
 
 static int     icmptimestamp = 0;

-SYSCTL_INT(_net_inet_icmp, ICMPCTL_TIMESTAMP, timestamp, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_icmp, ICMPCTL_TIMESTAMP, timestamp, CTLFLAG_RW | CTLFLAG_LOCKED,

        &icmptimestamp, 0, "");
 
 static int     drop_redirect = 0;
        &icmptimestamp, 0, "");
 
 static int     drop_redirect = 0;

-SYSCTL_INT(_net_inet_icmp, OID_AUTO, drop_redirect, CTLFLAG_RW, 
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, drop_redirect, CTLFLAG_RW | CTLFLAG_LOCKED,

        &drop_redirect, 0, "");
 
 static int     log_redirect = 0;
        &drop_redirect, 0, "");
 
 static int     log_redirect = 0;

-SYSCTL_INT(_net_inet_icmp, OID_AUTO, log_redirect, CTLFLAG_RW, 
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, log_redirect, CTLFLAG_RW | CTLFLAG_LOCKED,

        &log_redirect, 0, "");
 
 #if ICMP_BANDLIM 
        &log_redirect, 0, "");
 
 #if ICMP_BANDLIM 

- 
+
+/* Default values in case CONFIG_ICMP_BANDLIM is not defined in the MASTER file */
+#ifndef CONFIG_ICMP_BANDLIM
+#if !CONFIG_EMBEDDED
+#define CONFIG_ICMP_BANDLIM 250
+#else /* CONFIG_EMBEDDED */
+#define CONFIG_ICMP_BANDLIM 50
+#endif /* CONFIG_EMBEDDED */
+#endif /* CONFIG_ICMP_BANDLIM */
+

 /*    
  * ICMP error-response bandwidth limiting sysctl.  If not enabled, sysctl
  *      variable content is -1 and read-only.
  */     
     
 /*    
  * ICMP error-response bandwidth limiting sysctl.  If not enabled, sysctl
  *      variable content is -1 and read-only.
  */     
     

-static int      icmplim = 250;
-SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW,
+static int      icmplim = CONFIG_ICMP_BANDLIM;
+SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW | CTLFLAG_LOCKED,

        &icmplim, 0, "");
        &icmplim, 0, "");

-#else
+
+#else /* ICMP_BANDLIM */

 
 static int      icmplim = -1;
 
 static int      icmplim = -1;

-SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RD,
+SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RD | CTLFLAG_LOCKED,

        &icmplim, 0, "");
        
        &icmplim, 0, "");
        

-#endif 
+#endif /* ICMP_BANDLIM */

 
 /*
  * ICMP broadcast echo sysctl
  */
 
 static int     icmpbmcastecho = 1;
 
 /*
  * ICMP broadcast echo sysctl
  */
 
 static int     icmpbmcastecho = 1;

-SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW | CTLFLAG_LOCKED,

        &icmpbmcastecho, 0, "");
 
 
        &icmpbmcastecho, 0, "");
 
 


@@ -192,11 +198,16 @@ icmp_error(
        u_int32_t nextmtu)
 {
        struct ip *oip = mtod(n, struct ip *), *nip;
        u_int32_t nextmtu)
 {
        struct ip *oip = mtod(n, struct ip *), *nip;

-       unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
+       unsigned oiplen;

        struct icmp *icp;
        struct mbuf *m;
        unsigned icmplen;
 
        struct icmp *icp;
        struct mbuf *m;
        unsigned icmplen;
 

+       /* Expect 32-bit aligned data pointer on strict-align platforms */
+       MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(n);
+
+       oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
+

 #if ICMPPRINTFS
        if (icmpprintfs)
                printf("icmp_error(%p, %x, %d)\n", oip, type, code);
 #if ICMPPRINTFS
        if (icmpprintfs)
                printf("icmp_error(%p, %x, %d)\n", oip, type, code);


@@ -212,7 +223,8 @@ icmp_error(
                goto freeit;
        if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT &&
          n->m_len >= oiplen + ICMP_MINLEN &&
                goto freeit;
        if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT &&
          n->m_len >= oiplen + ICMP_MINLEN &&

-         !ICMP_INFOTYPE(((struct icmp *)((caddr_t)oip + oiplen))->icmp_type)) {
+         !ICMP_INFOTYPE(((struct icmp *)(void *)((caddr_t)oip + oiplen))->
+         icmp_type)) {

                icmpstat.icps_oldicmp++;
                goto freeit;
        }
                icmpstat.icps_oldicmp++;
                goto freeit;
        }


@@ -312,12 +324,17 @@ icmp_input(struct mbuf *m, int hlen)
 {
        struct icmp *icp;
        struct ip *ip = mtod(m, struct ip *);
 {
        struct icmp *icp;
        struct ip *ip = mtod(m, struct ip *);

-       int icmplen = ip->ip_len;
+       int icmplen;

        int i;
        struct in_ifaddr *ia;
        void (*ctlfunc)(int, struct sockaddr *, void *);
        int code;
 
        int i;
        struct in_ifaddr *ia;
        void (*ctlfunc)(int, struct sockaddr *, void *);
        int code;
 

+       /* Expect 32-bit aligned data pointer on strict-align platforms */
+       MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
+
+       icmplen = ip->ip_len;
+

        /*
         * Locate icmp structure in mbuf, and check
         * that not corrupted and of at least minimum length.
        /*
         * Locate icmp structure in mbuf, and check
         * that not corrupted and of at least minimum length.


@@ -353,21 +370,6 @@ icmp_input(struct mbuf *m, int hlen)
        m->m_len += hlen;
        m->m_data -= hlen;
 
        m->m_len += hlen;
        m->m_data -= hlen;
 

-#if defined(NFAITH) && 0 < NFAITH
-       if (m->m_pkthdr.rcvif && m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
-               /*
-                * Deliver very specific ICMP type only.
-                */
-               switch (icp->icmp_type) {
-               case ICMP_UNREACH:
-               case ICMP_TIMXCEED:
-                       break;
-               default:
-                       goto freeit;
-               }
-       }
-#endif
-

 #if ICMPPRINTFS
        if (icmpprintfs)
                printf("icmp_input, type %d code %d\n", icp->icmp_type,
 #if ICMPPRINTFS
        if (icmpprintfs)
                printf("icmp_input, type %d code %d\n", icp->icmp_type,


@@ -514,7 +516,6 @@ icmp_input(struct mbuf *m, int hlen)
                        goto reflect;
 
        case ICMP_MASKREQ:
                        goto reflect;
 
        case ICMP_MASKREQ:

-#define        satosin(sa)     ((struct sockaddr_in *)(sa))

                if (icmpmaskrepl == 0)
                        break;
                /*
                if (icmpmaskrepl == 0)
                        break;
                /*


@@ -537,8 +538,10 @@ icmp_input(struct mbuf *m, int hlen)
                            (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
                if (ia == 0)
                        break;
                            (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
                if (ia == 0)
                        break;

+               IFA_LOCK(&ia->ia_ifa);

                if (ia->ia_ifp == 0) {
                if (ia->ia_ifp == 0) {

-                       ifafree(&ia->ia_ifa);
+                       IFA_UNLOCK(&ia->ia_ifa);
+                       IFA_REMREF(&ia->ia_ifa);

                        ia = NULL;
                        break;
                }
                        ia = NULL;
                        break;
                }


@@ -550,7 +553,8 @@ icmp_input(struct mbuf *m, int hlen)
                        else if (ia->ia_ifp->if_flags & IFF_POINTOPOINT)
                            ip->ip_src = satosin(&ia->ia_dstaddr)->sin_addr;
                }
                        else if (ia->ia_ifp->if_flags & IFF_POINTOPOINT)
                            ip->ip_src = satosin(&ia->ia_dstaddr)->sin_addr;
                }

-               ifafree(&ia->ia_ifa);
+               IFA_UNLOCK(&ia->ia_ifa);
+               IFA_REMREF(&ia->ia_ifa);

 reflect:
                ip->ip_len += hlen;     /* since ip_input deducts this */
                icmpstat.icps_reflect++;
 reflect:
                ip->ip_len += hlen;     /* since ip_input deducts this */
                icmpstat.icps_reflect++;


@@ -662,8 +666,13 @@ icmp_reflect(struct mbuf *m)
         */
        lck_rw_lock_shared(in_ifaddr_rwlock);
        TAILQ_FOREACH(ia, INADDR_HASH(t.s_addr), ia_hash) {
         */
        lck_rw_lock_shared(in_ifaddr_rwlock);
        TAILQ_FOREACH(ia, INADDR_HASH(t.s_addr), ia_hash) {

-               if (t.s_addr == IA_SIN(ia)->sin_addr.s_addr)
+               IFA_LOCK(&ia->ia_ifa);
+               if (t.s_addr == IA_SIN(ia)->sin_addr.s_addr) {
+                       IFA_ADDREF_LOCKED(&ia->ia_ifa);
+                       IFA_UNLOCK(&ia->ia_ifa);

                        goto match;
                        goto match;

+               }
+               IFA_UNLOCK(&ia->ia_ifa);

        }
        /*
         * Slow path; check for broadcast addresses.  Find a source
        }
        /*
         * Slow path; check for broadcast addresses.  Find a source


@@ -671,13 +680,16 @@ icmp_reflect(struct mbuf *m)
         * let IP handle the source interface selection work.
         */
        for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) {
         * let IP handle the source interface selection work.
         */
        for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) {

+               IFA_LOCK(&ia->ia_ifa);

                if (ia->ia_ifp && (ia->ia_ifp->if_flags & IFF_BROADCAST) &&
                if (ia->ia_ifp && (ia->ia_ifp->if_flags & IFF_BROADCAST) &&

-                   t.s_addr == satosin(&ia->ia_broadaddr)->sin_addr.s_addr)
+                   t.s_addr == satosin(&ia->ia_broadaddr)->sin_addr.s_addr) {
+                       IFA_ADDREF_LOCKED(&ia->ia_ifa);
+                       IFA_UNLOCK(&ia->ia_ifa);

                        break;
                        break;

+               }
+               IFA_UNLOCK(&ia->ia_ifa);

        }
 match:
        }
 match:

-       if (ia)
-               ifaref(&ia->ia_ifa);

        lck_rw_done(in_ifaddr_rwlock);
        icmpdst.sin_addr = t;
        if ((ia == (struct in_ifaddr *)0) && m->m_pkthdr.rcvif)
        lck_rw_done(in_ifaddr_rwlock);
        icmpdst.sin_addr = t;
        if ((ia == (struct in_ifaddr *)0) && m->m_pkthdr.rcvif)


@@ -695,16 +707,18 @@ match:
                        m_freem(m);
                        goto done;
                }
                        m_freem(m);
                        goto done;
                }

-               ifaref(&ia->ia_ifa);
+               IFA_ADDREF(&ia->ia_ifa);

                lck_rw_done(in_ifaddr_rwlock);
        }
 #if CONFIG_MACF_NET
        mac_netinet_icmp_reply(m);
 #endif
                lck_rw_done(in_ifaddr_rwlock);
        }
 #if CONFIG_MACF_NET
        mac_netinet_icmp_reply(m);
 #endif

+       IFA_LOCK_SPIN(&ia->ia_ifa);

        t = IA_SIN(ia)->sin_addr;
        t = IA_SIN(ia)->sin_addr;

+       IFA_UNLOCK(&ia->ia_ifa);

        ip->ip_src = t;
        ip->ip_ttl = ip_defttl;
        ip->ip_src = t;
        ip->ip_ttl = ip_defttl;

-       ifafree(&ia->ia_ifa);
+       IFA_REMREF(&ia->ia_ifa);

        ia = NULL;
 
        if (optlen > 0) {
        ia = NULL;
 
        if (optlen > 0) {


@@ -797,10 +811,13 @@ icmp_send(struct mbuf *m, struct mbuf *opts)
        int hlen;
        struct icmp *icp;
        struct route ro;
        int hlen;
        struct icmp *icp;
        struct route ro;

-       struct ip_out_args ipoa = { IFSCOPE_NONE };
+       struct ip_out_args ipoa = { IFSCOPE_NONE, { 0 },
+           IPOAF_SELECT_SRCIF | IPOAF_BOUND_SRCADDR };

 
 

-       if ((m->m_flags & M_PKTHDR) && m->m_pkthdr.rcvif != NULL)
-               ipoa.ipoa_ifscope = m->m_pkthdr.rcvif->if_index;
+       if ((m->m_flags & M_PKTHDR) && m->m_pkthdr.rcvif != NULL) {
+               ipoa.ipoa_boundif = m->m_pkthdr.rcvif->if_index;
+               ipoa.ipoa_flags |= IPOAF_BOUND_IF;
+       }

 
        hlen = IP_VHL_HL(ip->ip_vhl) << 2;
        m->m_data += hlen;
 
        hlen = IP_VHL_HL(ip->ip_vhl) << 2;
        m->m_data += hlen;


@@ -1037,6 +1054,7 @@ icmp_dgram_ctloutput(struct socket *so, struct sockopt *sopt)
                case IP_RECVDSTADDR:
                case IP_RETOPTS:
                case IP_MULTICAST_IF:
                case IP_RECVDSTADDR:
                case IP_RETOPTS:
                case IP_MULTICAST_IF:

+               case IP_MULTICAST_IFINDEX:

                case IP_MULTICAST_TTL:
                case IP_MULTICAST_LOOP:
                case IP_ADD_MEMBERSHIP:
                case IP_MULTICAST_TTL:
                case IP_MULTICAST_LOOP:
                case IP_ADD_MEMBERSHIP:


@@ -1045,15 +1063,13 @@ icmp_dgram_ctloutput(struct socket *so, struct sockopt *sopt)
                case IP_PORTRANGE:
                case IP_RECVIF:
                case IP_IPSEC_POLICY:
                case IP_PORTRANGE:
                case IP_RECVIF:
                case IP_IPSEC_POLICY:

-#if defined(NFAITH) && NFAITH > 0
-               case IP_FAITH:
-#endif

                case IP_STRIPHDR:
                case IP_RECVTTL:
                case IP_BOUND_IF:
 #if CONFIG_FORCE_OUT_IFP
                 case IP_FORCE_OUT_IFP:
 #endif
                case IP_STRIPHDR:
                case IP_RECVTTL:
                case IP_BOUND_IF:
 #if CONFIG_FORCE_OUT_IFP
                 case IP_FORCE_OUT_IFP:
 #endif

+               case IP_NO_IFT_CELLULAR:

                        error = rip_ctloutput(so, sopt);
                        break;
 
                        error = rip_ctloutput(so, sopt);
                        break;
 


@@ -1077,6 +1093,8 @@ icmp_dgram_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *n
        int icmplen;
 
        if ((inp->inp_flags & INP_HDRINCL) != 0) {
        int icmplen;
 
        if ((inp->inp_flags & INP_HDRINCL) != 0) {

+               /* Expect 32-bit aligned data pointer on strict-align platforms */
+               MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);

                /*
                 * This is not raw IP, we liberal only for fields TOS, id and TTL 
                 */
                /*
                 * This is not raw IP, we liberal only for fields TOS, id and TTL 
                 */


@@ -1109,12 +1127,15 @@ icmp_dgram_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *n
                        }
                        TAILQ_FOREACH(ia, INADDR_HASH(ip->ip_src.s_addr),
                            ia_hash) {
                        }
                        TAILQ_FOREACH(ia, INADDR_HASH(ip->ip_src.s_addr),
                            ia_hash) {

+                               IFA_LOCK(&ia->ia_ifa);

                                if (IA_SIN(ia)->sin_addr.s_addr ==
                                    ip->ip_src.s_addr) {
                                if (IA_SIN(ia)->sin_addr.s_addr ==
                                    ip->ip_src.s_addr) {

+                                       IFA_UNLOCK(&ia->ia_ifa);

                                        lck_rw_done(in_ifaddr_rwlock);
                                        socket_lock(so, 0);
                                        goto ours;
                                }
                                        lck_rw_done(in_ifaddr_rwlock);
                                        socket_lock(so, 0);
                                        goto ours;
                                }

+                               IFA_UNLOCK(&ia->ia_ifa);

                        }
                        lck_rw_done(in_ifaddr_rwlock);
                        socket_lock(so, 0);
                        }
                        lck_rw_done(in_ifaddr_rwlock);
                        socket_lock(so, 0);


@@ -1123,8 +1144,8 @@ icmp_dgram_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *n
 ours:
                /* Do not trust we got a valid checksum */
                ip->ip_sum = 0;
 ours:
                /* Do not trust we got a valid checksum */
                ip->ip_sum = 0;

-               
-               icp = (struct icmp *)(((char *)m->m_data) + hlen);
+
+               icp = (struct icmp *)(void *)(((char *)m->m_data) + hlen);

                icmplen = m->m_pkthdr.len - hlen;
        } else {
                if ((icmplen = m->m_pkthdr.len) < ICMP_MINLEN) {
                icmplen = m->m_pkthdr.len - hlen;
        } else {
                if ((icmplen = m->m_pkthdr.len) < ICMP_MINLEN) {