xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / net / if_pflog.c

diff --git a/bsd/net/if_pflog.c b/bsd/net/if_pflog.c
index 1c9113d70647976823a6c662d8e8c619dfe02719..e1c0c84ca5aa0b851829521e0d11358c4747baf0 100644 (file)
--- a/bsd/net/if_pflog.c
+++ b/bsd/net/if_pflog.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2007-2018 Apple Inc. All rights reserved.

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


@@ -30,10 +30,10 @@
 /*     $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $      */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
 /*     $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $      */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),

- * Angelos D. Keromytis (kermit@csd.uch.gr) and 
+ * Angelos D. Keromytis (kermit@csd.uch.gr) and

  * Niels Provos (provos@physnet.uni-hamburg.de).
  *
  * Niels Provos (provos@physnet.uni-hamburg.de).
  *

- * This code was written by John Ioannidis for BSD/OS in Athens, Greece, 
+ * This code was written by John Ioannidis for BSD/OS in Athens, Greece,

  * in November 1995.
  *
  * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
  * in November 1995.
  *
  * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,


@@ -49,7 +49,7 @@
  * Permission to use, copy, and modify this software with or without fee
  * is hereby granted, provided that this entire notice is included in
  * all copies of any software which is or includes a copy or
  * Permission to use, copy, and modify this software with or without fee
  * is hereby granted, provided that this entire notice is included in
  * all copies of any software which is or includes a copy or

- * modification of this software. 
+ * modification of this software.

  * You may use this code under the GNU public license if you so wish. Please
  * contribute changes back to the authors under this freer than GPL license
  * so that we may further the use of strong encryption without limitations to
  * You may use this code under the GNU public license if you so wish. Please
  * contribute changes back to the authors under this freer than GPL license
  * so that we may further the use of strong encryption without limitations to


@@ -70,6 +70,8 @@
 #include <sys/ioctl.h>
 #include <sys/mcache.h>
 
 #include <sys/ioctl.h>
 #include <sys/mcache.h>
 

+#include <kern/zalloc.h>
+

 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>


@@ -83,18 +85,16 @@
 #include <netinet/ip.h>
 #endif
 
 #include <netinet/ip.h>
 #endif
 

-#if INET6

 #if !INET
 #include <netinet/in.h>
 #endif
 #include <netinet6/nd6.h>
 #if !INET
 #include <netinet/in.h>
 #endif
 #include <netinet6/nd6.h>

-#endif /* INET6 */

 
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 
 
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 

-#define        PFLOGNAME       "pflog"
-#define PFLOGMTU       (32768 + MHLEN + MLEN)
+#define PFLOGNAME       "pflog"
+#define PFLOGMTU        (32768 + MHLEN + MLEN)

 
 #ifdef PFLOGDEBUG
 #define DPRINTF(x)    do { if (pflogdebug) printf x ; } while (0)
 
 #ifdef PFLOGDEBUG
 #define DPRINTF(x)    do { if (pflogdebug) printf x ; } while (0)


@@ -102,6 +102,7 @@
 #define DPRINTF(x)
 #endif
 
 #define DPRINTF(x)
 #endif
 

+static int pflog_remove(struct ifnet *);

 static int pflog_clone_create(struct if_clone *, u_int32_t, void *);
 static int pflog_clone_destroy(struct ifnet *);
 static errno_t pflogoutput(struct ifnet *, struct mbuf *);
 static int pflog_clone_create(struct if_clone *, u_int32_t, void *);
 static int pflog_clone_destroy(struct ifnet *);
 static errno_t pflogoutput(struct ifnet *, struct mbuf *);


@@ -113,12 +114,12 @@ static errno_t pflogaddproto(struct ifnet *, protocol_family_t,
 static errno_t pflogdelproto(struct ifnet *, protocol_family_t);
 static void pflogfree(struct ifnet *);
 
 static errno_t pflogdelproto(struct ifnet *, protocol_family_t);
 static void pflogfree(struct ifnet *);
 

-static LIST_HEAD(, pflog_softc)        pflogif_list;
+static LIST_HEAD(, pflog_softc) pflogif_list;

 static struct if_clone pflog_cloner =
     IF_CLONE_INITIALIZER(PFLOGNAME, pflog_clone_create, pflog_clone_destroy,
 static struct if_clone pflog_cloner =
     IF_CLONE_INITIALIZER(PFLOGNAME, pflog_clone_create, pflog_clone_destroy,

-        0, (PFLOGIFS_MAX - 1));
+    0, (PFLOGIFS_MAX - 1), PFLOGIF_ZONE_MAX_ELEM, sizeof(struct pflog_softc));

 
 

-struct ifnet *pflogifs[PFLOGIFS_MAX];  /* for fast access */
+struct ifnet *pflogifs[PFLOGIFS_MAX];   /* for fast access */

 
 void
 pfloginit(void)
 
 void
 pfloginit(void)


@@ -126,8 +127,9 @@ pfloginit(void)
        int i;
 
        LIST_INIT(&pflogif_list);
        int i;
 
        LIST_INIT(&pflogif_list);

-       for (i = 0; i < PFLOGIFS_MAX; i++)
+       for (i = 0; i < PFLOGIFS_MAX; i++) {

                pflogifs[i] = NULL;
                pflogifs[i] = NULL;

+       }

 
        (void) if_clone_attach(&pflog_cloner);
 }
 
        (void) if_clone_attach(&pflog_cloner);
 }


@@ -146,15 +148,14 @@ pflog_clone_create(struct if_clone *ifc, u_int32_t unit, __unused void *params)
                /* NOTREACHED */
        }
 
                /* NOTREACHED */
        }
 

-       if ((pflogif = _MALLOC(sizeof (*pflogif),
-           M_DEVBUF, M_WAITOK|M_ZERO)) == NULL) {
+       if ((pflogif = if_clone_softc_allocate(&pflog_cloner)) == NULL) {

                error = ENOMEM;
                goto done;
        }
 
                error = ENOMEM;
                goto done;
        }
 

-       bzero(&pf_init, sizeof (pf_init));
+       bzero(&pf_init, sizeof(pf_init));

        pf_init.ver = IFNET_INIT_CURRENT_VERSION;
        pf_init.ver = IFNET_INIT_CURRENT_VERSION;

-       pf_init.len = sizeof (pf_init);
+       pf_init.len = sizeof(pf_init);

        pf_init.flags = IFNET_INIT_LEGACY;
        pf_init.name = ifc->ifc_name;
        pf_init.unit = unit;
        pf_init.flags = IFNET_INIT_LEGACY;
        pf_init.name = ifc->ifc_name;
        pf_init.unit = unit;


@@ -168,13 +169,14 @@ pflog_clone_create(struct if_clone *ifc, u_int32_t unit, __unused void *params)
        pf_init.ioctl = pflogioctl;
        pf_init.detach = pflogfree;
 
        pf_init.ioctl = pflogioctl;
        pf_init.detach = pflogfree;
 

-       bzero(pflogif, sizeof (*pflogif));
+       bzero(pflogif, sizeof(*pflogif));

        pflogif->sc_unit = unit;
        pflogif->sc_unit = unit;

+       pflogif->sc_flags |= IFPFLF_DETACHING;

 
        error = ifnet_allocate_extended(&pf_init, &pflogif->sc_if);
        if (error != 0) {
                printf("%s: ifnet_allocate failed - %d\n", __func__, error);
 
        error = ifnet_allocate_extended(&pf_init, &pflogif->sc_if);
        if (error != 0) {
                printf("%s: ifnet_allocate failed - %d\n", __func__, error);

-               _FREE(pflogif, M_DEVBUF);
+               if_clone_softc_deallocate(&pflog_cloner, pflogif);

                goto done;
        }
 
                goto done;
        }
 


@@ -185,7 +187,7 @@ pflog_clone_create(struct if_clone *ifc, u_int32_t unit, __unused void *params)
        if (error != 0) {
                printf("%s: ifnet_attach failed - %d\n", __func__, error);
                ifnet_release(pflogif->sc_if);
        if (error != 0) {
                printf("%s: ifnet_attach failed - %d\n", __func__, error);
                ifnet_release(pflogif->sc_if);

-               _FREE(pflogif, M_DEVBUF);
+               if_clone_softc_deallocate(&pflog_cloner, pflogif);

                goto done;
        }
 
                goto done;
        }
 


@@ -197,29 +199,50 @@ pflog_clone_create(struct if_clone *ifc, u_int32_t unit, __unused void *params)
        lck_mtx_lock(pf_lock);
        LIST_INSERT_HEAD(&pflogif_list, pflogif, sc_list);
        pflogifs[unit] = pflogif->sc_if;
        lck_mtx_lock(pf_lock);
        LIST_INSERT_HEAD(&pflogif_list, pflogif, sc_list);
        pflogifs[unit] = pflogif->sc_if;

+       pflogif->sc_flags &= ~IFPFLF_DETACHING;

        lck_mtx_unlock(pf_lock);
        lck_rw_done(pf_perim_lock);
 
 done:
        lck_mtx_unlock(pf_lock);
        lck_rw_done(pf_perim_lock);
 
 done:

-       return (error);
+       return error;

 }
 
 static int
 }
 
 static int

-pflog_clone_destroy(struct ifnet *ifp)
+pflog_remove(struct ifnet *ifp)

 {
 {

-       struct pflog_softc *pflogif = ifp->if_softc;
+       int error = 0;
+       struct pflog_softc *pflogif = NULL;

 
        lck_rw_lock_shared(pf_perim_lock);
        lck_mtx_lock(pf_lock);
 
        lck_rw_lock_shared(pf_perim_lock);
        lck_mtx_lock(pf_lock);

-       pflogifs[pflogif->sc_unit] = NULL;
+       pflogif = ifp->if_softc;
+
+       if (pflogif == NULL ||
+           (pflogif->sc_flags & IFPFLF_DETACHING) != 0) {
+               error = EINVAL;
+               goto done;
+       }
+
+       pflogif->sc_flags |= IFPFLF_DETACHING;

        LIST_REMOVE(pflogif, sc_list);
        LIST_REMOVE(pflogif, sc_list);

+done:

        lck_mtx_unlock(pf_lock);
        lck_rw_done(pf_perim_lock);
        lck_mtx_unlock(pf_lock);
        lck_rw_done(pf_perim_lock);

+       return error;
+}

 
 

-       /* bpfdetach() is taken care of as part of interface detach */
-       (void) ifnet_detach(ifp);
+static int
+pflog_clone_destroy(struct ifnet *ifp)
+{
+       int error = 0;

 
 

-       return 0;
+       if ((error = pflog_remove(ifp)) != 0) {
+               goto done;
+       }
+       /* bpfdetach() is taken care of as part of interface detach */
+       (void)ifnet_detach(ifp);
+done:
+       return error;

 }
 
 static errno_t
 }
 
 static errno_t


@@ -227,7 +250,7 @@ pflogoutput(struct ifnet *ifp, struct mbuf *m)
 {
        printf("%s: freeing data for %s\n", __func__, if_name(ifp));
        m_freem(m);
 {
        printf("%s: freeing data for %s\n", __func__, if_name(ifp));
        m_freem(m);

-       return (ENOTSUP);
+       return ENOTSUP;

 }
 
 static errno_t
 }
 
 static errno_t


@@ -239,16 +262,17 @@ pflogioctl(struct ifnet *ifp, unsigned long cmd, void *data)
        case SIOCAIFADDR:
        case SIOCSIFDSTADDR:
        case SIOCSIFFLAGS:
        case SIOCAIFADDR:
        case SIOCSIFDSTADDR:
        case SIOCSIFFLAGS:

-               if (ifnet_flags(ifp) & IFF_UP)
+               if (ifnet_flags(ifp) & IFF_UP) {

                        ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);
                        ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);

-               else
+               } else {

                        ifnet_set_flags(ifp, 0, IFF_RUNNING);
                        ifnet_set_flags(ifp, 0, IFF_RUNNING);

+               }

                break;
        default:
                break;
        default:

-               return (ENOTTY);
+               return ENOTTY;

        }
 
        }
 

-       return (0);
+       return 0;

 }
 
 static errno_t
 }
 
 static errno_t


@@ -257,7 +281,7 @@ pflogdemux(struct ifnet *ifp, struct mbuf *m, char *h, protocol_family_t *ppf)
 #pragma unused(h, ppf)
        printf("%s: freeing data for %s\n", __func__, if_name(ifp));
        m_freem(m);
 #pragma unused(h, ppf)
        printf("%s: freeing data for %s\n", __func__, if_name(ifp));
        m_freem(m);

-       return (EJUSTRETURN);
+       return EJUSTRETURN;

 }
 
 static errno_t
 }
 
 static errno_t


@@ -265,20 +289,20 @@ pflogaddproto(struct ifnet *ifp, protocol_family_t pf,
     const struct ifnet_demux_desc *d, u_int32_t cnt)
 {
 #pragma unused(ifp, pf, d, cnt)
     const struct ifnet_demux_desc *d, u_int32_t cnt)
 {
 #pragma unused(ifp, pf, d, cnt)

-       return (0);
+       return 0;

 }
 
 static errno_t
 pflogdelproto(struct ifnet *ifp, protocol_family_t pf)
 {
 #pragma unused(ifp, pf)
 }
 
 static errno_t
 pflogdelproto(struct ifnet *ifp, protocol_family_t pf)
 {
 #pragma unused(ifp, pf)

-       return (0);
+       return 0;

 }
 
 static void
 pflogfree(struct ifnet *ifp)
 {
 }
 
 static void
 pflogfree(struct ifnet *ifp)
 {

-       _FREE(ifp->if_softc, M_DEVBUF);
+       if_clone_softc_deallocate(&pflog_cloner, ifp->if_softc);

        ifp->if_softc = NULL;
        (void) ifnet_release(ifp);
 }
        ifp->if_softc = NULL;
        (void) ifnet_release(ifp);
 }


@@ -295,23 +319,25 @@ pflog_packet(struct pfi_kif *kif, pbuf_t *pbuf, sa_family_t af, u_int8_t dir,
 
        LCK_MTX_ASSERT(pf_lock, LCK_MTX_ASSERT_OWNED);
 
 
        LCK_MTX_ASSERT(pf_lock, LCK_MTX_ASSERT_OWNED);
 

-       if (kif == NULL || !pbuf_is_valid(pbuf) || rm == NULL || pd == NULL)
-               return (-1);
+       if (kif == NULL || !pbuf_is_valid(pbuf) || rm == NULL || pd == NULL) {
+               return -1;
+       }

 
        if (rm->logif >= PFLOGIFS_MAX ||
            (ifn = pflogifs[rm->logif]) == NULL || !ifn->if_bpf) {
 
        if (rm->logif >= PFLOGIFS_MAX ||
            (ifn = pflogifs[rm->logif]) == NULL || !ifn->if_bpf) {

-               return (0);
+               return 0;

        }
 
        }
 

-       if ((m = pbuf_to_mbuf(pbuf, FALSE)) == NULL)
-               return (0);
+       if ((m = pbuf_to_mbuf(pbuf, FALSE)) == NULL) {
+               return 0;
+       }

 
 

-       bzero(&hdr, sizeof (hdr));
+       bzero(&hdr, sizeof(hdr));

        hdr.length = PFLOG_REAL_HDRLEN;
        hdr.af = af;
        hdr.action = rm->action;
        hdr.reason = reason;
        hdr.length = PFLOG_REAL_HDRLEN;
        hdr.af = af;
        hdr.action = rm->action;
        hdr.reason = reason;

-       memcpy(hdr.ifname, kif->pfik_name, sizeof (hdr.ifname));
+       memcpy(hdr.ifname, kif->pfik_name, sizeof(hdr.ifname));

 
        if (am == NULL) {
                hdr.rulenr = htonl(rm->nr);
 
        if (am == NULL) {
                hdr.rulenr = htonl(rm->nr);


@@ -319,12 +345,14 @@ pflog_packet(struct pfi_kif *kif, pbuf_t *pbuf, sa_family_t af, u_int8_t dir,
        } else {
                hdr.rulenr = htonl(am->nr);
                hdr.subrulenr = htonl(rm->nr);
        } else {
                hdr.rulenr = htonl(am->nr);
                hdr.subrulenr = htonl(rm->nr);

-               if (ruleset != NULL && ruleset->anchor != NULL)
+               if (ruleset != NULL && ruleset->anchor != NULL) {

                        strlcpy(hdr.ruleset, ruleset->anchor->name,
                        strlcpy(hdr.ruleset, ruleset->anchor->name,

-                           sizeof (hdr.ruleset));
+                           sizeof(hdr.ruleset));
+               }

        }
        }

-       if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done)
+       if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done) {

                pd->lookup.done = pf_socket_lookup(dir, pd);
                pd->lookup.done = pf_socket_lookup(dir, pd);

+       }

        if (pd->lookup.done > 0) {
                hdr.uid = pd->lookup.uid;
                hdr.pid = pd->lookup.pid;
        if (pd->lookup.done > 0) {
                hdr.uid = pd->lookup.uid;
                hdr.pid = pd->lookup.pid;


@@ -362,5 +390,5 @@ pflog_packet(struct pfi_kif *kif, pbuf_t *pbuf, sa_family_t af, u_int8_t dir,
                break;
        }
 #endif /* NBPFILTER > 0 */
                break;
        }
 #endif /* NBPFILTER > 0 */

-       return (0);
+       return 0;

 }
 }