xnu-2782.1.97.tar.gz

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

diff --git a/bsd/netinet6/nd6_rtr.c b/bsd/netinet6/nd6_rtr.c
index b4f2cf4567edfd31737b1c9e7e62b09e0bde95b4..ceb0f7d9c7c029b8a22d682e3b90f9000a99f7af 100644 (file)
--- a/bsd/netinet6/nd6_rtr.c
+++ b/bsd/netinet6/nd6_rtr.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2003-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2003-2014 Apple Inc. All rights reserved.

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


@@ -72,7 +72,7 @@
 
 #include <dev/random/randomdev.h>
 
 
 #include <dev/random/randomdev.h>
 

-#include <kern/lock.h>
+#include <kern/locks.h>

 #include <kern/zalloc.h>
 #include <machine/machine_routines.h>
 
 #include <kern/zalloc.h>
 #include <machine/machine_routines.h>
 


@@ -316,17 +316,8 @@ nd6_rs_input(
                }
        }
 
                }
        }
 

-#ifndef PULLDOWN_TEST

        IP6_EXTHDR_CHECK(m, off, icmp6len, return);
        nd_rs = (struct nd_router_solicit *)((caddr_t)ip6 + off);
        IP6_EXTHDR_CHECK(m, off, icmp6len, return);
        nd_rs = (struct nd_router_solicit *)((caddr_t)ip6 + off);

-#else
-       IP6_EXTHDR_GET(nd_rs, struct nd_router_solicit *, m, off, icmp6len);
-       if (nd_rs == NULL) {
-               icmp6stat.icp6s_tooshort++;
-               return;
-       }
-#endif
-

        icmp6len -= sizeof (*nd_rs);
        nd6_option_init(nd_rs + 1, icmp6len, &ndopts);
        if (nd6_options(&ndopts) < 0) {
        icmp6len -= sizeof (*nd_rs);
        nd6_option_init(nd_rs + 1, icmp6len, &ndopts);
        if (nd6_options(&ndopts) < 0) {


@@ -430,16 +421,8 @@ nd6_ra_input(
                goto bad;
        }
 
                goto bad;
        }
 

-#ifndef PULLDOWN_TEST

        IP6_EXTHDR_CHECK(m, off, icmp6len, return);
        nd_ra = (struct nd_router_advert *)((caddr_t)ip6 + off);
        IP6_EXTHDR_CHECK(m, off, icmp6len, return);
        nd_ra = (struct nd_router_advert *)((caddr_t)ip6 + off);

-#else
-       IP6_EXTHDR_GET(nd_ra, struct nd_router_advert *, m, off, icmp6len);
-       if (nd_ra == NULL) {
-               icmp6stat.icp6s_tooshort++;
-               return;
-       }
-#endif

 
        icmp6len -= sizeof (*nd_ra);
        nd6_option_init(nd_ra + 1, icmp6len, &ndopts);
 
        icmp6len -= sizeof (*nd_ra);
        nd6_option_init(nd_ra + 1, icmp6len, &ndopts);


@@ -1506,12 +1489,16 @@ defrouter_select(struct ifnet *ifp)
                        ++update;
 
                /*
                        ++update;
 
                /*

-                * If the installed router is no longe reachable, remove
+                * If the installed router is no longer reachable, remove

                 * it and install the selected router instead.
                 */
                 * it and install the selected router instead.
                 */

-               if (installed_dr != NULL && selected_dr != NULL &&
-                   installed_dr != selected_dr && found_installedrt == FALSE) {
-                       installed_dr0 = installed_dr;   /* skip it below */
+               if (installed_dr != NULL
+                   && selected_dr != NULL 
+                   && installed_dr != selected_dr 
+                   && found_installedrt == FALSE
+                   && installed_dr->ifp == selected_dr->ifp) {
+                       /* skip it below */
+                       installed_dr0 = installed_dr;

                        /* NB: we previousled referenced installed_dr */
                        installed_dr = NULL;
                        selected_dr->genid = -1;
                        /* NB: we previousled referenced installed_dr */
                        installed_dr = NULL;
                        selected_dr->genid = -1;


@@ -2006,14 +1993,15 @@ purge_detached(struct ifnet *ifp)
        struct nd_prefix *pr, *pr_next;
        struct in6_ifaddr *ia;
        struct ifaddr *ifa, *ifa_next;
        struct nd_prefix *pr, *pr_next;
        struct in6_ifaddr *ia;
        struct ifaddr *ifa, *ifa_next;

+       boolean_t removed = FALSE;

 
        lck_mtx_lock(nd6_mutex);
 
        pr = nd_prefix.lh_first;
 repeat:
        while (pr) {
 
        lck_mtx_lock(nd6_mutex);
 
        pr = nd_prefix.lh_first;
 repeat:
        while (pr) {

-               pr_next = pr->ndpr_next;

                NDPR_LOCK(pr);
                NDPR_LOCK(pr);

+               pr_next = pr->ndpr_next;

                if (pr->ndpr_ifp != ifp ||
                    IN6_IS_ADDR_LINKLOCAL(&pr->ndpr_prefix.sin6_addr) ||
                    ((pr->ndpr_stateflags & NDPRF_DETACHED) == 0 &&
                if (pr->ndpr_ifp != ifp ||
                    IN6_IS_ADDR_LINKLOCAL(&pr->ndpr_prefix.sin6_addr) ||
                    ((pr->ndpr_stateflags & NDPRF_DETACHED) == 0 &&


@@ -2022,11 +2010,12 @@ repeat:
                        pr = pr_next;
                        continue;
                }
                        pr = pr_next;
                        continue;
                }

+               NDPR_ADDREF_LOCKED(pr);

                NDPR_UNLOCK(pr);
                ifnet_lock_shared(ifp);
                for (ifa = ifp->if_addrlist.tqh_first; ifa; ifa = ifa_next) {
                NDPR_UNLOCK(pr);
                ifnet_lock_shared(ifp);
                for (ifa = ifp->if_addrlist.tqh_first; ifa; ifa = ifa_next) {

-                       ifa_next = ifa->ifa_list.tqe_next;

                        IFA_LOCK(ifa);
                        IFA_LOCK(ifa);

+                       ifa_next = ifa->ifa_list.tqe_next;

                        if (ifa->ifa_addr->sa_family != AF_INET6) {
                                IFA_UNLOCK(ifa);
                                continue;
                        if (ifa->ifa_addr->sa_family != AF_INET6) {
                                IFA_UNLOCK(ifa);
                                continue;


@@ -2046,6 +2035,7 @@ repeat:
                                in6_purgeaddr(ifa);
                                IFA_REMREF(ifa); /* drop ours */
                                lck_mtx_lock(nd6_mutex);
                                in6_purgeaddr(ifa);
                                IFA_REMREF(ifa); /* drop ours */
                                lck_mtx_lock(nd6_mutex);

+                               NDPR_REMREF(pr);

                                pr = nd_prefix.lh_first;
                                goto repeat;
                        }
                                pr = nd_prefix.lh_first;
                                goto repeat;
                        }


@@ -2053,18 +2043,25 @@ repeat:
                }
                ifnet_lock_done(ifp);
                NDPR_LOCK(pr);
                }
                ifnet_lock_done(ifp);
                NDPR_LOCK(pr);

-               if (pr->ndpr_addrcnt == 0) {
-                       NDPR_ADDREF_LOCKED(pr);
+               if (pr->ndpr_addrcnt == 0 &&
+                   !(pr->ndpr_stateflags & NDPRF_DEFUNCT)) {

                        prelist_remove(pr);
                        NDPR_UNLOCK(pr);
                        prelist_remove(pr);
                        NDPR_UNLOCK(pr);

-                       pfxlist_onlink_check();
-                       NDPR_REMREF(pr);
+                       removed = TRUE;
+                       /*
+                        * Reset the search from the beginning because
+                        * nd6_mutex may have been dropped in
+                        * prelist_remove().
+                        */
+                       pr_next = nd_prefix.lh_first;

                } else {
                        NDPR_UNLOCK(pr);
                }
                } else {
                        NDPR_UNLOCK(pr);
                }

+               NDPR_REMREF(pr);

                pr = pr_next;
        }
                pr = pr_next;
        }

-
+       if (removed)
+               pfxlist_onlink_check();

        lck_mtx_unlock(nd6_mutex);
 }
 
        lck_mtx_unlock(nd6_mutex);
 }
 


@@ -2203,6 +2200,18 @@ prelist_remove(struct nd_prefix *pr)
        lck_mtx_assert(nd6_mutex, LCK_MTX_ASSERT_OWNED);
        NDPR_LOCK_ASSERT_HELD(pr);
 
        lck_mtx_assert(nd6_mutex, LCK_MTX_ASSERT_OWNED);
        NDPR_LOCK_ASSERT_HELD(pr);
 

+       if (pr->ndpr_stateflags & NDPRF_DEFUNCT)
+               return;
+
+       /*
+        * If there are no more addresses, defunct the prefix.  This is needed
+        * because we don't want multiple threads calling prelist_remove() for
+        * the same prefix and this might happen because we unlock nd6_mutex
+        * down below.
+        */
+       if (pr->ndpr_addrcnt == 0)
+               pr->ndpr_stateflags |= NDPRF_DEFUNCT;
+

        /* make sure to invalidate the prefix until it is really freed. */
        pr->ndpr_vltime = 0;
        pr->ndpr_pltime = 0;
        /* make sure to invalidate the prefix until it is really freed. */
        pr->ndpr_vltime = 0;
        pr->ndpr_pltime = 0;


@@ -2212,8 +2221,7 @@ prelist_remove(struct nd_prefix *pr)
         * of pr->ndpr_raf_onlink and pr->ndpr_raf_auto not to confuse users
         * when executing "ndp -p".
         */
         * of pr->ndpr_raf_onlink and pr->ndpr_raf_auto not to confuse users
         * when executing "ndp -p".
         */

-
-       if ((pr->ndpr_stateflags & NDPRF_ONLINK)) {
+       if (pr->ndpr_stateflags & NDPRF_ONLINK) {

                NDPR_ADDREF_LOCKED(pr);
                NDPR_UNLOCK(pr);
                lck_mtx_unlock(nd6_mutex);
                NDPR_ADDREF_LOCKED(pr);
                NDPR_UNLOCK(pr);
                lck_mtx_unlock(nd6_mutex);


@@ -2230,8 +2238,14 @@ prelist_remove(struct nd_prefix *pr)
                        return;
        }
 
                        return;
        }
 

-       if (pr->ndpr_addrcnt > 0)
-               return; /* notice here? */
+       if (pr->ndpr_addrcnt > 0) {
+               /*
+                * The state might have changed if we called
+                * nd6_prefix_offlink().
+                */
+               pr->ndpr_stateflags &= ~NDPRF_DEFUNCT;
+               return; /* notice here? */
+       }

 
        /* unlink ndpr_entry from nd_prefix list */
        LIST_REMOVE(pr, ndpr_entry);
 
        /* unlink ndpr_entry from nd_prefix list */
        LIST_REMOVE(pr, ndpr_entry);


@@ -2298,7 +2312,6 @@ prelist_update(
 #endif
        }
 
 #endif
        }
 

-

        if ((pr = nd6_prefix_lookup(new)) != NULL) {
                /*
                 * nd6_prefix_lookup() ensures that pr and new have the same
        if ((pr = nd6_prefix_lookup(new)) != NULL) {
                /*
                 * nd6_prefix_lookup() ensures that pr and new have the same


@@ -2323,6 +2336,7 @@ prelist_update(
                        pr->ndpr_lastupdate = net_uptime();
                }
 
                        pr->ndpr_lastupdate = net_uptime();
                }
 

+               NDPR_ADDREF_LOCKED(pr);

                if (new->ndpr_raf_onlink &&
                    (pr->ndpr_stateflags & NDPRF_ONLINK) == 0) {
                        int e;
                if (new->ndpr_raf_onlink &&
                    (pr->ndpr_stateflags & NDPRF_ONLINK) == 0) {
                        int e;


@@ -2346,6 +2360,7 @@ prelist_update(
                } else {
                        NDPR_UNLOCK(pr);
                }
                } else {
                        NDPR_UNLOCK(pr);
                }

+               NDPR_REMREF(pr);

                lck_mtx_unlock(nd6_mutex);
        } else {
                struct nd_prefix *newpr = NULL;
                lck_mtx_unlock(nd6_mutex);
        } else {
                struct nd_prefix *newpr = NULL;


@@ -2905,6 +2920,8 @@ ndpr_getexpire(struct nd_prefix *pr)
  * A supplement function used in the on-link detection below;
  * detect if a given prefix has a (probably) reachable advertising router.
  * XXX: lengthy function name...
  * A supplement function used in the on-link detection below;
  * detect if a given prefix has a (probably) reachable advertising router.
  * XXX: lengthy function name...

+ *
+ * Callers *must* increase the reference count of nd_prefix.

  */
 static struct nd_pfxrouter *
 find_pfxlist_reachable_router(struct nd_prefix *pr)
  */
 static struct nd_pfxrouter *
 find_pfxlist_reachable_router(struct nd_prefix *pr)


@@ -3003,8 +3020,10 @@ pfxlist_onlink_check(void)
                NDPR_ADDREF_LOCKED(pr);
                if (pr->ndpr_raf_onlink && find_pfxlist_reachable_router(pr) &&
                    (pr->ndpr_debug & IFD_ATTACHED)) {
                NDPR_ADDREF_LOCKED(pr);
                if (pr->ndpr_raf_onlink && find_pfxlist_reachable_router(pr) &&
                    (pr->ndpr_debug & IFD_ATTACHED)) {

-                       NDPR_UNLOCK(pr);
-                       NDPR_REMREF(pr);
+                       if (NDPR_REMREF_LOCKED(pr) == NULL)
+                               pr = NULL;
+                       else
+                               NDPR_UNLOCK(pr);

                        break;
                }
                pr->ndpr_stateflags |= NDPRF_PROCESSED_ONLINK;
                        break;
                }
                pr->ndpr_stateflags |= NDPRF_PROCESSED_ONLINK;


@@ -3022,7 +3041,6 @@ pfxlist_onlink_check(void)
                prclear->ndpr_stateflags &= ~NDPRF_PROCESSED_ONLINK;
                NDPR_UNLOCK(prclear);
        }
                prclear->ndpr_stateflags &= ~NDPRF_PROCESSED_ONLINK;
                NDPR_UNLOCK(prclear);
        }

-

        /*
         * If we have no such prefix, check whether we still have a router
         * that does not advertise any prefixes.
        /*
         * If we have no such prefix, check whether we still have a router
         * that does not advertise any prefixes.


@@ -3109,13 +3127,6 @@ pfxlist_onlink_check(void)
                prclear->ndpr_stateflags &= ~NDPRF_PROCESSED_ONLINK;
                NDPR_UNLOCK(prclear);
        }
                prclear->ndpr_stateflags &= ~NDPRF_PROCESSED_ONLINK;
                NDPR_UNLOCK(prclear);
        }

-       VERIFY(nd_prefix_busy);
-       nd_prefix_busy = FALSE;
-       if (nd_prefix_waiters > 0) {
-               nd_prefix_waiters = 0;
-               wakeup(nd_prefix_waitchan);
-       }
-

        /*
         * Remove each interface route associated with a (just) detached
         * prefix, and reinstall the interface route for a (just) attached
        /*
         * Remove each interface route associated with a (just) detached
         * prefix, and reinstall the interface route for a (just) attached


@@ -3130,11 +3141,15 @@ pfxlist_onlink_check(void)
 
                NDPR_LOCK(pr);
                if (pr->ndpr_raf_onlink == 0 ||
 
                NDPR_LOCK(pr);
                if (pr->ndpr_raf_onlink == 0 ||

-                   pr->ndpr_stateflags & NDPRF_STATIC) {
+                   pr->ndpr_stateflags & NDPRF_STATIC ||
+                   pr->ndpr_stateflags & NDPRF_PROCESSED_ONLINK ||
+                   pr->ndpr_stateflags & NDPRF_DEFUNCT) {

                        NDPR_UNLOCK(pr);
                        pr = pr->ndpr_next;
                        continue;
                }
                        NDPR_UNLOCK(pr);
                        pr = pr->ndpr_next;
                        continue;
                }

+               pr->ndpr_stateflags |= NDPRF_PROCESSED_ONLINK;
+               NDPR_ADDREF_LOCKED(pr);

                if ((pr->ndpr_stateflags & NDPRF_DETACHED) != 0 &&
                    (pr->ndpr_stateflags & NDPRF_ONLINK) != 0) {
                        NDPR_UNLOCK(pr);
                if ((pr->ndpr_stateflags & NDPRF_DETACHED) != 0 &&
                    (pr->ndpr_stateflags & NDPRF_ONLINK) != 0) {
                        NDPR_UNLOCK(pr);


@@ -3147,6 +3162,7 @@ pfxlist_onlink_check(void)
                                    pr->ndpr_plen, e));
                        }
                        lck_mtx_lock(nd6_mutex);
                                    pr->ndpr_plen, e));
                        }
                        lck_mtx_lock(nd6_mutex);

+                       NDPR_REMREF(pr);

                        pr = nd_prefix.lh_first;
                        continue;
                }
                        pr = nd_prefix.lh_first;
                        continue;
                }


@@ -3161,11 +3177,26 @@ pfxlist_onlink_check(void)
                                    ip6_sprintf(&pr->ndpr_prefix.sin6_addr),
                                    pr->ndpr_plen, e));
                        }
                                    ip6_sprintf(&pr->ndpr_prefix.sin6_addr),
                                    pr->ndpr_plen, e));
                        }

+                       NDPR_REMREF(pr);
+                       pr = nd_prefix.lh_first;
+                       continue;

                } else {
                        NDPR_UNLOCK(pr);
                }
                } else {
                        NDPR_UNLOCK(pr);
                }

+               NDPR_REMREF(pr);

                pr = pr->ndpr_next;
        }
                pr = pr->ndpr_next;
        }

+       LIST_FOREACH(prclear, &nd_prefix, ndpr_entry) {
+               NDPR_LOCK(prclear);
+               prclear->ndpr_stateflags &= ~NDPRF_PROCESSED_ONLINK;
+               NDPR_UNLOCK(prclear);
+       }
+       VERIFY(nd_prefix_busy);
+       nd_prefix_busy = FALSE;
+       if (nd_prefix_waiters > 0) {
+               nd_prefix_waiters = 0;
+               wakeup(nd_prefix_waitchan);
+       }

 
        /*
         * Changes on the prefix status might affect address status as well.
 
        /*
         * Changes on the prefix status might affect address status as well.


@@ -3203,14 +3234,17 @@ pfxlist_onlink_check(void)
                        IFA_UNLOCK(&ifa->ia_ifa);
                        continue;
                }
                        IFA_UNLOCK(&ifa->ia_ifa);
                        continue;
                }

-               NDPR_ADDREF(ndpr);

                IFA_UNLOCK(&ifa->ia_ifa);
 
                NDPR_LOCK(ndpr);
                IFA_UNLOCK(&ifa->ia_ifa);
 
                NDPR_LOCK(ndpr);

+               NDPR_ADDREF_LOCKED(ndpr);

                if (find_pfxlist_reachable_router(ndpr)) {
                if (find_pfxlist_reachable_router(ndpr)) {

-                       NDPR_UNLOCK(ndpr);
-                       NDPR_REMREF(ndpr);
-                       found = 1;
+                       if (NDPR_REMREF_LOCKED(ndpr) == NULL) {
+                               found = 0;
+                       } else {
+                               NDPR_UNLOCK(ndpr);
+                               found = 1;
+                       }

                        break;
                }
                NDPR_UNLOCK(ndpr);
                        break;
                }
                NDPR_UNLOCK(ndpr);


@@ -3230,9 +3264,9 @@ pfxlist_onlink_check(void)
                                IFA_UNLOCK(&ifa->ia_ifa);
                                continue;
                        }
                                IFA_UNLOCK(&ifa->ia_ifa);
                                continue;
                        }

-                       NDPR_ADDREF(ndpr);

                        IFA_UNLOCK(&ifa->ia_ifa);
                        NDPR_LOCK(ndpr);
                        IFA_UNLOCK(&ifa->ia_ifa);
                        NDPR_LOCK(ndpr);

+                       NDPR_ADDREF_LOCKED(ndpr);

                        if (find_pfxlist_reachable_router(ndpr)) {
                                NDPR_UNLOCK(ndpr);
                                IFA_LOCK(&ifa->ia_ifa);
                        if (find_pfxlist_reachable_router(ndpr)) {
                                NDPR_UNLOCK(ndpr);
                                IFA_LOCK(&ifa->ia_ifa);


@@ -3560,7 +3594,8 @@ nd6_prefix_onlink_common(struct nd_prefix *pr, boolean_t force_scoped,
         * TODO: If the prefix route exists, we should really find it and
         * refer the prefix to it; otherwise ndpr_rt is NULL.
         */
         * TODO: If the prefix route exists, we should really find it and
         * refer the prefix to it; otherwise ndpr_rt is NULL.
         */

-       if (rt != NULL || error == EEXIST) {
+       if (!(pr->ndpr_stateflags & NDPRF_DEFUNCT) &&
+           (rt != NULL || error == EEXIST)) {

                struct nd_ifinfo *ndi;
 
                VERIFY(pr->ndpr_prproxy_sols_cnt == 0);
                struct nd_ifinfo *ndi;
 
                VERIFY(pr->ndpr_prproxy_sols_cnt == 0);


@@ -3591,7 +3626,8 @@ nd6_prefix_onlink_common(struct nd_prefix *pr, boolean_t force_scoped,
 
                lck_mtx_unlock(&ndi->lock);
                lck_rw_done(nd_if_rwlock);
 
                lck_mtx_unlock(&ndi->lock);
                lck_rw_done(nd_if_rwlock);

-       }
+       } else if (rt != NULL && pr->ndpr_stateflags & NDPRF_DEFUNCT)
+               rtfree(rt);

 
        prproxy = (pr->ndpr_stateflags & NDPRF_PRPROXY);
        VERIFY(!prproxy || !(pr->ndpr_stateflags & NDPRF_IFSCOPE));
 
        prproxy = (pr->ndpr_stateflags & NDPRF_PRPROXY);
        VERIFY(!prproxy || !(pr->ndpr_stateflags & NDPRF_IFSCOPE));


@@ -3720,8 +3756,8 @@ nd6_prefix_offlink(struct nd_prefix *pr)
                            &opr->ndpr_prefix.sin6_addr, plen)) {
                                int e;
 
                            &opr->ndpr_prefix.sin6_addr, plen)) {
                                int e;
 

+                               NDPR_ADDREF_LOCKED(opr);

                                NDPR_UNLOCK(opr);
                                NDPR_UNLOCK(opr);

-                               lck_mtx_unlock(nd6_mutex);

                                if ((e = nd6_prefix_onlink(opr)) != 0) {
                                        nd6log((LOG_ERR,
                                            "nd6_prefix_offlink: failed to "
                                if ((e = nd6_prefix_onlink(opr)) != 0) {
                                        nd6log((LOG_ERR,
                                            "nd6_prefix_offlink: failed to "


@@ -3732,7 +3768,7 @@ nd6_prefix_offlink(struct nd_prefix *pr)
                                            opr->ndpr_plen, if_name(ifp),
                                            if_name(opr->ndpr_ifp), e));
                                }
                                            opr->ndpr_plen, if_name(ifp),
                                            if_name(opr->ndpr_ifp), e));
                                }

-                               lck_mtx_lock(nd6_mutex);
+                               NDPR_REMREF(opr);

                                opr = nd_prefix.lh_first;
                        } else {
                                NDPR_UNLOCK(opr);
                                opr = nd_prefix.lh_first;
                        } else {
                                NDPR_UNLOCK(opr);


@@ -3841,7 +3877,7 @@ in6_pfx_newpersistaddr(struct nd_prefix *pr, int mcast, int *errorp)
        }
 
        bzero(&ifra, sizeof (ifra));
        }
 
        bzero(&ifra, sizeof (ifra));

-       strncpy(ifra.ifra_name, if_name(ifp), sizeof (ifra.ifra_name));
+       strlcpy(ifra.ifra_name, if_name(ifp), sizeof (ifra.ifra_name));

        ifra.ifra_addr.sin6_family = AF_INET6;
        ifra.ifra_addr.sin6_len = sizeof (struct sockaddr_in6);
 
        ifra.ifra_addr.sin6_family = AF_INET6;
        ifra.ifra_addr.sin6_len = sizeof (struct sockaddr_in6);
 


@@ -3951,7 +3987,7 @@ in6_pfx_newpersistaddr(struct nd_prefix *pr, int mcast, int *errorp)
        }
 
        VERIFY(ia6 != NULL);
        }
 
        VERIFY(ia6 != NULL);

-       in6_post_msg(ifp, KEV_INET6_NEW_RTADV_ADDR, ia6);
+       in6_post_msg(ifp, KEV_INET6_NEW_RTADV_ADDR, ia6, NULL);

        goto done;
 
 unlock2:
        goto done;
 
 unlock2:


@@ -3982,7 +4018,7 @@ in6_tmpifadd(const struct in6_ifaddr *ia0, int forcegen)
        struct nd_prefix *ndpr;
 
        bzero(&ifra, sizeof (ifra));
        struct nd_prefix *ndpr;
 
        bzero(&ifra, sizeof (ifra));

-       strncpy(ifra.ifra_name, if_name(ifp), sizeof (ifra.ifra_name));
+       strlcpy(ifra.ifra_name, if_name(ifp), sizeof (ifra.ifra_name));

        IFA_LOCK(&IA6_NONCONST(ia0)->ia_ifa);
        ifra.ifra_addr = ia0->ia_addr;
        /* copy prefix mask */
        IFA_LOCK(&IA6_NONCONST(ia0)->ia_ifa);
        ifra.ifra_addr = ia0->ia_addr;
        /* copy prefix mask */


@@ -4297,7 +4333,7 @@ nd6_setdefaultiface(
                }
 
                /*
                }
 
                /*

-                * Our current implementation assumes one-to-one maping between
+                * Our current implementation assumes one-to-one mapping between

                 * interfaces and links, so it would be natural to use the
                 * default interface as the default link.
                 */
                 * interfaces and links, so it would be natural to use the
                 * default interface as the default link.
                 */