summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2007-11-01 20:37:48 +0000
committerdyoung <dyoung@NetBSD.org>2007-11-01 20:37:48 +0000
commit08fdf3b0debf39b8e5ba2a13889d0302ff44aa96 (patch)
tree7d97b3d83074ac280e12d15e7b57e2bee25cbeb7 /sys
parent122b86e247f51ffb3876e1c75362da7043b604e8 (diff)
Change a few malloc(9) + memset(3) pairs to malloc(..., ...|M_ZERO).
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 3a7e143eee0..d9e1e45acda 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.202 2007/10/11 20:47:27 dyoung Exp $ */
+/* $NetBSD: if.c,v 1.203 2007/11/01 20:37:48 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.202 2007/10/11 20:47:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.203 2007/11/01 20:37:48 dyoung Exp $");
#include "opt_inet.h"
@@ -287,8 +287,7 @@ if_alloc_sadl(struct ifnet *ifp)
addrlen = ifp->if_addrlen;
socksize = roundup(sockaddr_dl_measure(namelen, addrlen), sizeof(long));
ifasize = sizeof(*ifa) + 2 * socksize;
- ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK);
- memset(ifa, 0, ifasize);
+ ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK|M_ZERO);
sdl = (struct sockaddr_dl *)(ifa + 1);
mask = (struct sockaddr_dl *)(socksize + (char *)sdl);
@@ -405,8 +404,7 @@ if_attach(struct ifnet *ifp)
/* grow ifnet_addrs */
m = oldlim * sizeof(struct ifaddr *);
n = if_indexlim * sizeof(struct ifaddr *);
- q = (void *)malloc(n, M_IFADDR, M_WAITOK);
- memset(q, 0, n);
+ q = (void *)malloc(n, M_IFADDR, M_WAITOK|M_ZERO);
if (ifnet_addrs != NULL) {
memcpy(q, ifnet_addrs, m);
free((void *)ifnet_addrs, M_IFADDR);
@@ -416,8 +414,7 @@ if_attach(struct ifnet *ifp)
/* grow ifindex2ifnet */
m = oldlim * sizeof(struct ifnet *);
n = if_indexlim * sizeof(struct ifnet *);
- q = (void *)malloc(n, M_IFADDR, M_WAITOK);
- memset(q, 0, n);
+ q = (void *)malloc(n, M_IFADDR, M_WAITOK|M_ZERO);
if (ifindex2ifnet != NULL) {
memcpy(q, (void *)ifindex2ifnet, m);
free((void *)ifindex2ifnet, M_IFADDR);