From 918549eb3151450239d659ae968cb9e68b863bfc Mon Sep 17 00:00:00 2001
From: dwmalone <dwmalone@FreeBSD.org>
Date: Sat, 18 Nov 2000 15:17:43 +0000
Subject: [PATCH] Add the use of M_ZERO to netgraph.

Submitted by:	josh@zipperup.org
Submitted by:	Robert Drehmel <robd@gmx.net>
Submitted by:	archie
Approved by:	archie
---
 sys/netgraph/ng_UI.c          |  3 +--
 sys/netgraph/ng_async.c       |  3 +--
 sys/netgraph/ng_base.c        |  6 ++----
 sys/netgraph/ng_bpf.c         |  3 +--
 sys/netgraph/ng_bridge.c      | 12 ++++--------
 sys/netgraph/ng_cisco.c       |  3 +--
 sys/netgraph/ng_ether.c       |  3 +--
 sys/netgraph/ng_frame_relay.c |  3 +--
 sys/netgraph/ng_iface.c       |  6 ++----
 sys/netgraph/ng_ksocket.c     |  3 +--
 sys/netgraph/ng_lmi.c         |  3 +--
 sys/netgraph/ng_message.h     |  6 ++----
 sys/netgraph/ng_mppc.c        |  3 +--
 sys/netgraph/ng_parse.c       |  3 +--
 sys/netgraph/ng_ppp.c         |  3 +--
 sys/netgraph/ng_pppoe.c       | 11 +++++------
 sys/netgraph/ng_pptpgre.c     |  3 +--
 sys/netgraph/ng_rfc1490.c     |  3 +--
 sys/netgraph/ng_sample.c      |  4 ++--
 sys/netgraph/ng_socket.c      |  9 +++------
 sys/netgraph/ng_tee.c         |  3 +--
 sys/netgraph/ng_tty.c         |  3 +--
 sys/netgraph/ng_vjc.c         |  3 +--
 23 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index c294c743ef68..b410a51577ac 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -108,10 +108,9 @@ ng_UI_constructor(node_p *nodep)
 	int     error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 75ccfc813580..43781fe8b26a 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -182,10 +182,9 @@ nga_constructor(node_p *nodep)
 
 	if ((error = ng_make_node_common(&typestruct, nodep)))
 		return (error);
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
-	bzero(sc, sizeof(*sc));
 	sc->amode = MODE_HUNT;
 	sc->cfg.accm = ~0;
 	sc->cfg.amru = NG_ASYNC_DEFAULT_MRU;
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index d6d4924f9a80..b0bfbbf3f6ed 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -355,12 +355,11 @@ ng_make_node_common(struct ng_type *type, node_p *nodepp)
 	}
 
 	/* Make a node and try attach it to the type */
-	MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_NOWAIT);
+	MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (node == NULL) {
 		TRAP_ERROR;
 		return (ENOMEM);
 	}
-	bzero(node, sizeof(*node));
 	node->type = type;
 	node->refs++;				/* note reference */
 	type->refs++;
@@ -674,12 +673,11 @@ ng_add_hook(node_p node, const char *name, hook_p *hookp)
 	}
 
 	/* Allocate the hook and link it up */
-	MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_NOWAIT);
+	MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (hook == NULL) {
 		TRAP_ERROR;
 		return (ENOMEM);
 	}
-	bzero(hook, sizeof(*hook));
 	hook->refs = 1;
 	hook->flags = HK_INVALID;
 	hook->node = node;
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index b884c538b63b..8b09b6a83ba2 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -237,10 +237,9 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name)
 	int error;
 
 	/* Create hook private structure */
-	MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_NOWAIT);
+	MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (hip == NULL)
 		return (ENOMEM);
-	bzero(hip, sizeof(*hip));
 	hip->hook = hook;
 	hook->private = hip;
 	hip->node = node;
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index f2c662a68166..4c27798f6d4e 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -299,20 +299,18 @@ ng_bridge_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate and initialize private info */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 	callout_init(&priv->timer);
 
 	/* Allocate and initialize hash table, etc. */
 	MALLOC(priv->tab, struct ng_bridge_bucket *,
-	    MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT);
+	    MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv->tab == NULL) {
 		FREE(priv, M_NETGRAPH);
 		return (ENOMEM);
 	}
-	bzero(priv->tab, MIN_BUCKETS * sizeof(*priv->tab));  /* init SLIST's */
 	priv->numBuckets = MIN_BUCKETS;
 	priv->hashMask = MIN_BUCKETS - 1;
 	priv->conf.debugLevel = 1;
@@ -358,10 +356,9 @@ ng_bridge_newhook(node_p node, hook_p hook, const char *name)
 		if (priv->links[linkNum] != NULL)
 			return (EISCONN);
 		MALLOC(priv->links[linkNum], struct ng_bridge_link *,
-		    sizeof(*priv->links[linkNum]), M_NETGRAPH, M_NOWAIT);
+		    sizeof(*priv->links[linkNum]), M_NETGRAPH, M_NOWAIT|M_ZERO);
 		if (priv->links[linkNum] == NULL)
 			return (ENOMEM);
-		bzero(priv->links[linkNum], sizeof(*priv->links[linkNum]));
 		priv->links[linkNum]->hook = hook;
 		LINK_NUM(hook) = linkNum;
 		priv->numLinks++;
@@ -854,10 +851,9 @@ ng_bridge_rehash(priv_p priv)
 
 	/* Allocate and initialize new table */
 	MALLOC(newTab, struct ng_bridge_bucket *,
-	    newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT);
+	    newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (newTab == NULL)
 		return;
-	bzero(newTab, newNumBuckets * sizeof(*newTab));
 
 	/* Move all entries from old table to new table */
 	for (oldBucket = 0; oldBucket < priv->numBuckets; oldBucket++) {
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 9d18feefd4a7..8355ee2147f2 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -196,10 +196,9 @@ cisco_constructor(node_p *nodep)
 	sc_p sc;
 	int error = 0;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
-	bzero(sc, sizeof(struct cisco_priv));
 
 	callout_handle_init(&sc->handle);
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 14105b63e940..fcf2f83c7cb3 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -312,14 +312,13 @@ ng_ether_attach(struct ifnet *ifp)
 	}
 
 	/* Allocate private data */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		log(LOG_ERR, "%s: can't %s for %s\n",
 		    __FUNCTION__, "allocate memory", name);
 		ng_unref(node);
 		return;
 	}
-	bzero(priv, sizeof(*priv));
 	node->private = priv;
 	priv->ifp = ifp;
 	IFP2NG(ifp) = node;
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 2ee1e1c8bac0..e58eb80e7b76 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -218,10 +218,9 @@ ngfrm_constructor(node_p *nodep)
 	sc_p sc;
 	int error = 0;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (!sc)
 		return (ENOMEM);
-	bzero(sc, sizeof(*sc));
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
 		FREE(sc, M_NETGRAPH);
 		return (error);
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 528f8838d132..146e4b668dbe 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -531,16 +531,14 @@ ng_iface_constructor(node_p *nodep)
 	int error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT|M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
-	MALLOC(ifp, struct ifnet *, sizeof(*ifp), M_NETGRAPH, M_NOWAIT);
+	MALLOC(ifp, struct ifnet *, sizeof(*ifp), M_NETGRAPH, M_NOWAIT|M_ZERO);
 	if (ifp == NULL) {
 		FREE(priv, M_NETGRAPH);
 		return (ENOMEM);
 	}
-	bzero(ifp, sizeof(*ifp));
 
 	/* Link them together */
 	ifp->if_softc = priv;
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index 56bbba0c37d0..8b2e54e2763a 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -491,10 +491,9 @@ ng_ksocket_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&ng_ksocket_typestruct, nodep))) {
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 8be4276ad8d8..c2eba39b8d70 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -190,10 +190,9 @@ nglmi_constructor(node_p *nodep)
 	sc_p sc;
 	int error = 0;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
-	bzero(sc, sizeof(*sc));
 
 	callout_handle_init(&sc->handle);
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index b84a6f72cf90..6b1b139201c1 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -292,10 +292,9 @@ struct typelist {
 #define NG_MKMESSAGE(msg, cookie, cmdid, len, how)			\
 	do {								\
 	  MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg)	\
-	    + (len), M_NETGRAPH, (how));				\
+	    + (len), M_NETGRAPH, (how) | M_ZERO);			\
 	  if ((msg) == NULL)						\
 	    break;							\
-	  bzero((msg), sizeof(struct ng_mesg) + (len));			\
 	  (msg)->header.version = NG_VERSION;				\
 	  (msg)->header.typecookie = (cookie);				\
 	  (msg)->header.cmd = (cmdid);					\
@@ -311,10 +310,9 @@ struct typelist {
 #define NG_MKRESPONSE(rsp, msg, len, how)				\
 	do {								\
 	  MALLOC((rsp), struct ng_mesg *, sizeof(struct ng_mesg)	\
-	    + (len), M_NETGRAPH, (how));				\
+	    + (len), M_NETGRAPH, (how) | M_ZERO);			\
 	  if ((rsp) == NULL)						\
 	    break;							\
-	  bzero((rsp), sizeof(struct ng_mesg) + (len));			\
 	  (rsp)->header.version = NG_VERSION;				\
 	  (rsp)->header.arglen = (len);					\
 	  (rsp)->header.token = (msg)->header.token;			\
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 5b69bca254a1..ddd48b7040bd 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -178,10 +178,9 @@ ng_mppc_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&ng_mppc_typestruct, nodep))) {
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index 83bcb11cf474..15d122e17631 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -1122,12 +1122,11 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s,
 	int align, len, blen, error = 0;
 
 	/* Initialize */
-	MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH, M_NOWAIT);
+	MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (foff == NULL) {
 		error = ENOMEM;
 		goto done;
 	}
-	bzero(foff, num * sizeof(*foff));
 
 	/* Get opening brace/bracket */
 	if (ng_parse_get_token(s, off, &len)
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index b748caa0e59a..ba16fad88cee 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -382,10 +382,9 @@ ng_ppp_constructor(node_p *nodep)
 	int i, error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&ng_ppp_typestruct, nodep))) {
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 331572f6848b..193c99ae231c 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -537,10 +537,10 @@ ng_pppoe_constructor(node_p *nodep)
 
 AAA
 	/* Initialize private descriptor */
-	MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT);
+	MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH,
+	    M_NOWAIT | M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
-	bzero(privdata, sizeof(*privdata));
 
 	/* Call the 'generic' (ie, superclass) node constructor */
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
@@ -581,11 +581,10 @@ AAA
 		 * The infrastructure has already checked that it's unique,
 		 * so just allocate it and hook it in.
 		 */
-		MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT);
+		MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT | M_ZERO);
 		if (sp == NULL) {
 				return (ENOMEM);
 		}
-		bzero(sp, sizeof(*sp));
 
 		hook->private = sp;
 		sp->hook = hook;
@@ -662,13 +661,13 @@ AAA
 			/*
 			 * set up prototype header
 			 */
-			MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, M_NOWAIT);
+			MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH,
+			    M_NOWAIT | M_ZERO);
 
 			if (neg == NULL) {
 				printf("pppoe: Session out of memory\n");
 				LEAVE(ENOMEM);
 			}
-			bzero(neg, sizeof(*neg));
 			MGETHDR(neg->m, M_DONTWAIT, MT_DATA);
 			if(neg->m == NULL) {
 				printf("pppoe: Session out of mbufs\n");
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 3009135e223f..60892bafa453 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -277,10 +277,9 @@ ng_pptpgre_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&ng_pptpgre_typestruct, nodep))) {
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 9aca3c3cd22e..02b1c3bdab34 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -126,10 +126,9 @@ ng_rfc1490_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&typestruct, nodep))) {
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index bf69fcd8ee68..d9ec259787f7 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -152,10 +152,10 @@ ng_xxx_constructor(node_p *nodep)
 	int i, error;
 
 	/* Initialize private descriptor */
-	MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT);
+	MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH,
+		M_NOWAIT | M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
-	bzero(privdata, sizeof(struct XXX));
 	for (i = 0; i < XXX_NUM_DLCIS; i++) {
 		privdata->channel[i].dlci = -2;
 		privdata->channel[i].channel = i;
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index a917bcb084da..4e31b30324f4 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -404,8 +404,7 @@ ng_setsockaddr(struct socket *so, struct sockaddr **addr)
 	if (pcbp->sockdata->node->name != NULL)
 		sg_len += namelen = strlen(pcbp->sockdata->node->name);
 
-	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK);
-	bzero(sg, sg_len);
+	MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK | M_ZERO);
 
 	if (pcbp->sockdata->node->name != NULL)
 		bcopy(pcbp->sockdata->node->name, sg->sg_data, namelen);
@@ -438,12 +437,11 @@ ng_attach_cntl(struct socket *so)
 
 	/* Allocate node private info */
 	MALLOC(privdata, struct ngsock *,
-	    sizeof(*privdata), M_NETGRAPH, M_WAITOK);
+	    sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO);
 	if (privdata == NULL) {
 		ng_detach_common(pcbp, NG_CONTROL);
 		return (ENOMEM);
 	}
-	bzero(privdata, sizeof(*privdata));
 
 	/* Make the generic node components */
 	if ((error = ng_make_node_common(&typestruct, &privdata->node)) != 0) {
@@ -482,10 +480,9 @@ ng_attach_common(struct socket *so, int type)
 		return (error);
 
 	/* Allocate the pcb */
-	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK);
+	MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK | M_ZERO);
 	if (pcbp == NULL)
 		return (ENOMEM);
-	bzero(pcbp, sizeof(*pcbp));
 	pcbp->type = type;
 
 	/* Link the pcb and the socket */
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 69140b8457c5..b27d435af793 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -153,10 +153,9 @@ ngt_constructor(node_p *nodep)
 	sc_p privdata;
 	int error = 0;
 
-	MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT);
+	MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT|M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
-	bzero(privdata, sizeof(*privdata));
 
 	if ((error = ng_make_node_common(&ng_tee_typestruct, nodep))) {
 		FREE(privdata, M_NETGRAPH);
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index e217f3a645b1..74e4d18c05b4 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -208,12 +208,11 @@ ngt_open(dev_t dev, struct tty *tp)
 	}
 
 	/* Initialize private struct */
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK);
+	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO);
 	if (sc == NULL) {
 		error = ENOMEM;
 		goto done;
 	}
-	bzero(sc, sizeof(*sc));
 	sc->tp = tp;
 	sc->hotchar = NG_TTY_DFL_HOTCHAR;
 	sc->qtail = &sc->qhead;
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 3b76e57a8623..6faf6c4da826 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -252,10 +252,9 @@ ng_vjc_constructor(node_p *nodep)
 	int error;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
-	bzero(priv, sizeof(*priv));
 
 	/* Call generic node constructor */
 	if ((error = ng_make_node_common(&ng_vjc_typestruct, nodep))) {