Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.37.2.3 retrieving revision 1.71 diff -u -p -r1.37.2.3 -r1.71 --- src/sys/netinet6/mld6.c 2007/10/09 13:44:56 1.37.2.3 +++ src/sys/netinet6/mld6.c 2016/07/07 09:32:03 1.71 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.37.2.3 2007/10/09 13:44:56 ad Exp $ */ +/* $NetBSD: mld6.c,v 1.71 2016/07/07 09:32:03 ozaki-r Exp $ */ /* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */ /* @@ -102,19 +102,23 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.37.2.3 2007/10/09 13:44:56 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.71 2016/07/07 09:32:03 ozaki-r Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include #include #include #include +#include #include #include #include #include #include +#include #include @@ -125,6 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 #include #include #include +#include #include #include @@ -134,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 * This structure is used to keep track of in6_multi chains which belong to * deleted interface addresses. */ -static LIST_HEAD(, multi6_kludge) in6_mk; /* XXX BSS initialization */ +static LIST_HEAD(, multi6_kludge) in6_mk = LIST_HEAD_INITIALIZER(in6_mk); struct multi6_kludge { LIST_ENTRY(multi6_kludge) mk_entry; @@ -163,11 +168,10 @@ static struct mld_hdr * mld_allocbuf(str static void mld_sendpkt(struct in6_multi *, int, const struct in6_addr *); static void mld_starttimer(struct in6_multi *); static void mld_stoptimer(struct in6_multi *); -static void mld_timeo(struct in6_multi *); static u_long mld_timerresid(struct in6_multi *); void -mld_init() +mld_init(void) { static u_int8_t hbh_buf[8]; struct ip6_hbh *hbh = (struct ip6_hbh *)hbh_buf; @@ -181,11 +185,12 @@ mld_init() hbh_buf[3] = 0; hbh_buf[4] = IP6OPT_RTALERT; hbh_buf[5] = IP6OPT_RTALERT_LEN - 2; - bcopy((void *)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t)); + memcpy(&hbh_buf[6], (void *)&rtalert_code, sizeof(u_int16_t)); ip6_opts.ip6po_hbh = hbh; /* We will specify the hoplimit by a multicast option. */ ip6_opts.ip6po_hlim = -1; + ip6_opts.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; } static void @@ -193,6 +198,8 @@ mld_starttimer(struct in6_multi *in6m) { struct timeval now; + KASSERT(in6m->in6m_timer != IN6M_TIMER_UNDEF); + microtime(&now); in6m->in6m_timer_expire.tv_sec = now.tv_sec + in6m->in6m_timer / hz; in6m->in6m_timer_expire.tv_usec = now.tv_usec + @@ -203,8 +210,7 @@ mld_starttimer(struct in6_multi *in6m) } /* start or restart the timer */ - callout_reset(in6m->in6m_timer_ch, in6m->in6m_timer, - (void (*) __P((void *)))mld_timeo, in6m); + callout_schedule(&in6m->in6m_timer_ch, in6m->in6m_timer); } static void @@ -213,19 +219,23 @@ mld_stoptimer(struct in6_multi *in6m) if (in6m->in6m_timer == IN6M_TIMER_UNDEF) return; - callout_stop(in6m->in6m_timer_ch); + callout_stop(&in6m->in6m_timer_ch); in6m->in6m_timer = IN6M_TIMER_UNDEF; } static void -mld_timeo(struct in6_multi *in6m) +mld_timeo(void *arg) { - int s = splsoftnet(); + struct in6_multi *in6m = arg; - in6m->in6m_timer = IN6M_TIMER_UNDEF; + mutex_enter(softnet_lock); + KERNEL_LOCK(1, NULL); - callout_stop(in6m->in6m_timer_ch); + if (in6m->in6m_timer == IN6M_TIMER_UNDEF) + goto out; + + in6m->in6m_timer = IN6M_TIMER_UNDEF; switch (in6m->in6m_state) { case MLD_REPORTPENDING: @@ -236,7 +246,9 @@ mld_timeo(struct in6_multi *in6m) break; } - splx(s); +out: + KERNEL_UNLOCK_ONE(NULL); + mutex_exit(softnet_lock); } static u_long @@ -260,7 +272,7 @@ mld_timerresid(struct in6_multi *in6m) } /* return the remaining time in milliseconds */ - return (((u_long)(diff.tv_sec * 1000000 + diff.tv_usec)) / 1000); + return diff.tv_sec * 1000 + diff.tv_usec / 1000; } static void @@ -287,7 +299,7 @@ mld_start_listening(struct in6_multi *in in6m->in6m_state = MLD_OTHERLISTENER; } else { mld_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); - in6m->in6m_timer = arc4random() % + in6m->in6m_timer = cprng_fast32() % (MLD_UNSOLICITED_REPORT_INTERVAL * hz); in6m->in6m_state = MLD_IREPORTEDLAST; @@ -322,18 +334,20 @@ mld_stop_listening(struct in6_multi *in6 void mld_input(struct mbuf *m, int off) { - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); + struct ip6_hdr *ip6; struct mld_hdr *mldh; - struct ifnet *ifp = m->m_pkthdr.rcvif; + struct ifnet *ifp; struct in6_multi *in6m = NULL; struct in6_addr mld_addr, all_in6; struct in6_ifaddr *ia; - int timer = 0; /* timer value in the MLD query header */ + u_long timer = 0; /* timer value in the MLD query header */ + int s; + ifp = m_get_rcvif(m, &s); IP6_EXTHDR_GET(mldh, struct mld_hdr *, m, off, sizeof(*mldh)); if (mldh == NULL) { - icmp6stat.icp6s_tooshort++; - return; + ICMP6_STATINC(ICMP6_STAT_TOOSHORT); + goto out_nodrop; } /* source address validation */ @@ -363,8 +377,7 @@ mld_input(struct mbuf *m, int off) "mld_input: src %s is not link-local (grp=%s)\n", ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&mldh->mld_addr)); #endif - m_freem(m); - return; + goto out; } /* @@ -373,8 +386,7 @@ mld_input(struct mbuf *m, int off) mld_addr = mldh->mld_addr; if (in6_setscope(&mld_addr, ifp, NULL)) { /* XXX: this should not happen! */ - m_free(m); - return; + goto out; } /* @@ -439,9 +451,9 @@ mld_input(struct mbuf *m, int off) mld_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); in6m->in6m_state = MLD_IREPORTEDLAST; } else if (in6m->in6m_timer == IN6M_TIMER_UNDEF || - mld_timerresid(in6m) > (u_long)timer) { - in6m->in6m_timer = arc4random() % - (int)(((long)timer * hz) / 1000); + mld_timerresid(in6m) > timer) { + in6m->in6m_timer = + 1 + (cprng_fast32() % timer) * hz / 1000; mld_starttimer(in6m); } } @@ -485,7 +497,10 @@ mld_input(struct mbuf *m, int off) break; } +out: m_freem(m); +out_nodrop: + m_put_rcvif(ifp, &s); } static void @@ -529,7 +544,7 @@ mld_sendpkt(struct in6_multi *in6m, int /* construct multicast option */ memset(&im6o, 0, sizeof(im6o)); - im6o.im6o_multicast_ifp = ifp; + im6o.im6o_multicast_if_index = if_get_index(ifp); im6o.im6o_multicast_hlim = 1; /* @@ -539,7 +554,7 @@ mld_sendpkt(struct in6_multi *in6m, int im6o.im6o_multicast_loop = (ip6_mrouter != NULL); /* increment output statictics */ - icmp6stat.icp6s_outhist[type]++; + ICMP6_STATINC(ICMP6_STAT_OUTHIST + type); icmp6_ifstat_inc(ifp, ifs6_out_msg); switch (type) { case MLD_LISTENER_QUERY: @@ -554,7 +569,7 @@ mld_sendpkt(struct in6_multi *in6m, int } ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC, - &im6o, (struct socket *)NULL, NULL); + &im6o, NULL, NULL); } static struct mld_hdr * @@ -582,7 +597,7 @@ mld_allocbuf(struct mbuf **mh, int len, (*mh)->m_next = md; md->m_next = NULL; - (*mh)->m_pkthdr.rcvif = NULL; + m_reset_rcvif((*mh)); (*mh)->m_pkthdr.len = sizeof(struct ip6_hdr) + len; (*mh)->m_len = sizeof(struct ip6_hdr); MH_ALIGN(*mh, sizeof(struct ip6_hdr)); @@ -614,7 +629,7 @@ in6_addmulti(struct in6_addr *maddr6, st int *errorp, int timer) { struct in6_ifaddr *ia; - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_multi *in6m; int s = splsoftnet(); @@ -635,57 +650,47 @@ in6_addmulti(struct in6_addr *maddr6, st * and link it into the interface's multicast list. */ in6m = (struct in6_multi *) - malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT); + malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT|M_ZERO); if (in6m == NULL) { splx(s); *errorp = ENOBUFS; return (NULL); } - memset(in6m, 0, sizeof(*in6m)); in6m->in6m_addr = *maddr6; in6m->in6m_ifp = ifp; in6m->in6m_refcount = 1; in6m->in6m_timer = IN6M_TIMER_UNDEF; - in6m->in6m_timer_ch = - malloc(sizeof(*in6m->in6m_timer_ch), M_IPMADDR, M_NOWAIT); - if (in6m->in6m_timer_ch == NULL) { - free(in6m, M_IPMADDR); - splx(s); - return (NULL); - } + callout_init(&in6m->in6m_timer_ch, CALLOUT_MPSAFE); + callout_setfunc(&in6m->in6m_timer_ch, mld_timeo, in6m); + IFP_TO_IA6(ifp, ia); if (ia == NULL) { - /* leaks in6m_timer_ch */ + callout_destroy(&in6m->in6m_timer_ch); free(in6m, M_IPMADDR); splx(s); *errorp = EADDRNOTAVAIL; /* appropriate? */ return (NULL); } in6m->in6m_ia = ia; - IFAREF(&ia->ia_ifa); /* gain a reference */ + ifaref(&ia->ia_ifa); /* gain a reference */ LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); /* * Ask the network driver to update its multicast reception * filter appropriately for the new address. */ - sockaddr_in6_init(&ifr.ifr_addr, maddr6, 0, 0, 0); - if (ifp->if_ioctl == NULL) - *errorp = ENXIO; /* XXX: appropriate? */ - else - *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, - (void *)&ifr); + sockaddr_in6_init(&sin6, maddr6, 0, 0, 0); + *errorp = if_mcast_op(ifp, SIOCADDMULTI, sin6tosa(&sin6)); if (*errorp) { + callout_destroy(&in6m->in6m_timer_ch); LIST_REMOVE(in6m, in6m_entry); - /* leaks in6m_timer_ch */ free(in6m, M_IPMADDR); - IFAFREE(&ia->ia_ifa); + ifafree(&ia->ia_ifa); splx(s); return (NULL); } - callout_init(in6m->in6m_timer_ch, 0); in6m->in6m_timer = timer; if (in6m->in6m_timer > 0) { in6m->in6m_state = MLD_REPORTPENDING; @@ -711,7 +716,7 @@ in6_addmulti(struct in6_addr *maddr6, st void in6_delmulti(struct in6_multi *in6m) { - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_ifaddr *ia; int s = splsoftnet(); @@ -729,7 +734,7 @@ in6_delmulti(struct in6_multi *in6m) */ LIST_REMOVE(in6m, in6m_entry); if (in6m->in6m_ia != NULL) { - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ in6m->in6m_ia = NULL; } @@ -737,7 +742,7 @@ in6_delmulti(struct in6_multi *in6m) * Delete all references of this multicasting group from * the membership arrays */ - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + IN6_ADDRLIST_READER_FOREACH(ia) { struct in6_multi_mship *imm; LIST_FOREACH(imm, &ia->ia6_memberships, i6mm_chain) { if (imm->i6mm_maddr == in6m) @@ -749,10 +754,14 @@ in6_delmulti(struct in6_multi *in6m) * Notify the network driver to update its multicast * reception filter. */ - sockaddr_in6_init(&ifr.ifr_addr, &in6m->in6m_addr, 0, 0, 0); - (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, - SIOCDELMULTI, (void *)&ifr); - free(in6m->in6m_timer_ch, M_IPMADDR); + sockaddr_in6_init(&sin6, &in6m->in6m_addr, 0, 0, 0); + if_mcast_op(in6m->in6m_ifp, SIOCDELMULTI, sin6tosa(&sin6)); + + /* Tell mld_timeo we're halting the timer */ + in6m->in6m_timer = IN6M_TIMER_UNDEF; + callout_halt(&in6m->in6m_timer_ch, softnet_lock); + callout_destroy(&in6m->in6m_timer_ch); + free(in6m, M_IPMADDR); } splx(s); @@ -765,13 +774,12 @@ in6_joingroup(struct ifnet *ifp, struct { struct in6_multi_mship *imm; - imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT); - if (!imm) { + imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT|M_ZERO); + if (imm == NULL) { *errorp = ENOBUFS; return NULL; } - memset(imm, 0, sizeof(*imm)); imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp, timer); if (!imm->i6mm_maddr) { /* *errorp is already set */ @@ -810,8 +818,8 @@ in6_savemkludge(struct in6_ifaddr *oia) KASSERT(ia != oia); while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { LIST_REMOVE(in6m, in6m_entry); - IFAREF(&ia->ia_ifa); - IFAFREE(&in6m->in6m_ia->ia_ifa); + ifaref(&ia->ia_ifa); + ifafree(&in6m->in6m_ia->ia_ifa); in6m->in6m_ia = ia; LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); } @@ -827,7 +835,7 @@ in6_savemkludge(struct in6_ifaddr *oia) while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { LIST_REMOVE(in6m, in6m_entry); - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ in6m->in6m_ia = NULL; LIST_INSERT_HEAD(&mk->mk_head, in6m, in6m_entry); } @@ -854,7 +862,7 @@ in6_restoremkludge(struct in6_ifaddr *ia while ((in6m = LIST_FIRST(&mk->mk_head)) != NULL) { LIST_REMOVE(in6m, in6m_entry); in6m->in6m_ia = ia; - IFAREF(&ia->ia_ifa); + ifaref(&ia->ia_ifa); LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); } } @@ -881,9 +889,8 @@ in6_createmkludge(struct ifnet *ifp) return; } - mk = malloc(sizeof(*mk), M_IPMADDR, M_WAITOK); + mk = malloc(sizeof(*mk), M_IPMADDR, M_ZERO|M_WAITOK); - memset(mk, 0, sizeof(*mk)); LIST_INIT(&mk->mk_head); mk->mk_ifp = ifp; LIST_INSERT_HEAD(&in6_mk, mk, mk_entry); @@ -910,3 +917,157 @@ in6_purgemkludge(struct ifnet *ifp) LIST_REMOVE(mk, mk_entry); free(mk, M_IPMADDR); } + +static int +in6_mkludge_sysctl(SYSCTLFN_ARGS) +{ + struct multi6_kludge *mk; + struct in6_multi *in6m; + int error; + uint32_t tmp; + size_t written; + + if (namelen != 1) + return EINVAL; + + if (oldp == NULL) { + *oldlenp = 0; + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp->if_index == name[0]) + continue; + LIST_FOREACH(in6m, &mk->mk_head, in6m_entry) { + *oldlenp += sizeof(struct in6_addr) + + sizeof(uint32_t); + } + } + return 0; + } + + error = 0; + written = 0; + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp->if_index == name[0]) + continue; + LIST_FOREACH(in6m, &mk->mk_head, in6m_entry) { + if (written + sizeof(struct in6_addr) + + sizeof(uint32_t) > *oldlenp) + goto done; + error = sysctl_copyout(l, &in6m->in6m_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + tmp = in6m->in6m_refcount; + error = sysctl_copyout(l, &tmp, oldp, sizeof(tmp)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(tmp); + written += sizeof(tmp); + } + } + +done: + *oldlenp = written; + return error; +} + +static int +in6_multicast_sysctl(SYSCTLFN_ARGS) +{ + struct ifnet *ifp; + struct ifaddr *ifa; + struct in6_ifaddr *ifa6; + struct in6_multi *in6m; + uint32_t tmp; + int error; + size_t written; + struct psref psref; + int bound; + + if (namelen != 1) + return EINVAL; + + bound = curlwp_bind(); + ifp = if_get_byindex(name[0], &psref); + if (ifp == NULL) { + curlwp_bindx(bound); + return ENODEV; + } + + if (oldp == NULL) { + *oldlenp = 0; + IFADDR_READER_FOREACH(ifa, ifp) { + if (ifa->ifa_addr->sa_family != AF_INET6) + continue; + ifa6 = (struct in6_ifaddr *)ifa; + LIST_FOREACH(in6m, &ifa6->ia6_multiaddrs, in6m_entry) { + *oldlenp += 2 * sizeof(struct in6_addr) + + sizeof(uint32_t); + } + } + if_put(ifp, &psref); + curlwp_bindx(bound); + return 0; + } + + error = 0; + written = 0; + IFADDR_READER_FOREACH(ifa, ifp) { + if (ifa->ifa_addr->sa_family != AF_INET6) + continue; + ifa6 = (struct in6_ifaddr *)ifa; + LIST_FOREACH(in6m, &ifa6->ia6_multiaddrs, in6m_entry) { + if (written + 2 * sizeof(struct in6_addr) + + sizeof(uint32_t) > *oldlenp) + goto done; + error = sysctl_copyout(l, &ifa6->ia_addr.sin6_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + error = sysctl_copyout(l, &in6m->in6m_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + tmp = in6m->in6m_refcount; + error = sysctl_copyout(l, &tmp, oldp, sizeof(tmp)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(tmp); + written += sizeof(tmp); + } + } +done: + if_put(ifp, &psref); + curlwp_bindx(bound); + *oldlenp = written; + return error; +} + +SYSCTL_SETUP(sysctl_in6_mklude_setup, "sysctl net.inet6.multicast_kludge subtree setup") +{ + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "inet6", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "multicast", + SYSCTL_DESCR("Multicast information"), + in6_multicast_sysctl, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_CREATE, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "multicast_kludge", + SYSCTL_DESCR("multicast kludge information"), + in6_mkludge_sysctl, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_CREATE, CTL_EOL); +}