 @@ -1,14 +1,14 @@
-/*	$NetBSD: mld6.c,v 1.50 2009/04/18 14:58:05 tsutsui Exp $	*/
+/*	$NetBSD: mld6.c,v 1.51 2009/08/04 22:04:23 dyoung Exp $	*/
 /*	$KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -92,27 +92,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.50 2009/04/18 14:58:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.51 2009/08/04 22:04:23 dyoung Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
 @@ -627,34 +627,33 @@ in6_addmulti(struct in6_addr *maddr6, st
 	 */
 	IN6_LOOKUP_MULTI(*maddr6, ifp, in6m);
 	if (in6m != NULL) {
 		/*
 		 * Found it; just increment the refrence count.
 		 */
 		in6m->in6m_refcount++;
 	} else {
 		/*
 		 * New address; allocate a new multicast record
 		 * 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;
 		IFP_TO_IA6(ifp, ia);
 		if (ia == NULL) {
 			free(in6m, M_IPMADDR);
 			splx(s);
 			*errorp = EADDRNOTAVAIL; /* appropriate? */
 			return (NULL);
+		}
 		in6m->in6m_ia = ia;
 		IFAREF(&ia->ia_ifa); /* gain a reference */
 @@ -744,33 +743,32 @@ in6_delmulti(struct in6_multi *in6m)
 		callout_destroy(&in6m->in6m_timer_ch);
 		free(in6m, M_IPMADDR);
+	}
 	splx(s);
+}
 struct in6_multi_mship *
 in6_joingroup(struct ifnet *ifp, struct in6_addr *addr,
 	int *errorp, int timer)
+{
 	struct in6_multi_mship *imm;
-	imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT);
+	imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT|M_ZERO);
-	if (!imm) {
+	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 */
 		free(imm, M_IPMADDR);
 		return NULL;
+	}
 	return imm;
+}
 int
 in6_leavegroup(struct in6_multi_mship *imm)
+{
 @@ -860,29 +858,28 @@ in6_restoremkludge(struct in6_ifaddr *ia
  * it is a global function.
  */
 void
 in6_createmkludge(struct ifnet *ifp)
+{
 	struct multi6_kludge *mk;
 	LIST_FOREACH(mk, &in6_mk, mk_entry) {
 		/* If we've already had one, do not allocate. */
 		if (mk->mk_ifp == 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);
+}
 void
 in6_purgemkludge(struct ifnet *ifp)
+{
 	struct multi6_kludge *mk;
 	struct in6_multi *in6m, *next;
 	LIST_FOREACH(mk, &in6_mk, mk_entry) {
 		if (mk->mk_ifp == ifp)