diff options
| author | David Malone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
|---|---|---|
| committer | David Malone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
| commit | 7cc0979fd64b721c92c3dd4a8688b56e15c9a5f9 (patch) | |
| tree | c383ffd6da8fbab2789828310191f8717f675124 /sys/netinet/in.c | |
| parent | b1f3daafde37fa36b819c0649c121d98175a6a2d (diff) | |
Notes
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 7dcfe8775106..f8d591edebfb 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -283,10 +283,9 @@ in_control(so, cmd, data, ifp, p) return (EADDRNOTAVAIL); if (ia == (struct in_ifaddr *)0) { ia = (struct in_ifaddr *) - malloc(sizeof *ia, M_IFADDR, M_WAITOK); + malloc(sizeof *ia, M_IFADDR, M_WAITOK | M_ZERO); if (ia == (struct in_ifaddr *)NULL) return (ENOBUFS); - bzero((caddr_t)ia, sizeof *ia); /* * Protect from ipintr() traversing address list * while we're modifying it. @@ -802,13 +801,13 @@ in_addmulti(ap, ifp) /* XXX - if_addmulti uses M_WAITOK. Can this really be called at interrupt time? If so, need to fix if_addmulti. XXX */ - inm = (struct in_multi *)malloc(sizeof(*inm), M_IPMADDR, M_NOWAIT); + inm = (struct in_multi *)malloc(sizeof(*inm), M_IPMADDR, + M_NOWAIT | M_ZERO); if (inm == NULL) { splx(s); return (NULL); } - bzero(inm, sizeof *inm); inm->inm_addr = *ap; inm->inm_ifp = ifp; inm->inm_ifma = ifma; |