diff options
| author | David Malone <dwmalone@FreeBSD.org> | 2000-11-18 15:17:43 +0000 |
|---|---|---|
| committer | David Malone <dwmalone@FreeBSD.org> | 2000-11-18 15:17:43 +0000 |
| commit | 99cdf4ccb20964be566b457fdf69729b22b1d3d8 (patch) | |
| tree | a6e1f0c867f08373c60669cd830de7a5c4680d51 /sys/netgraph/ng_socket.c | |
| parent | 238fe5f74d5db21ef7b65a64af54a30280153252 (diff) | |
Notes
Diffstat (limited to 'sys/netgraph/ng_socket.c')
| -rw-r--r-- | sys/netgraph/ng_socket.c | 9 |
1 files changed, 3 insertions, 6 deletions
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 */ |