1 files changed, 4 insertions, 9 deletions

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 55c0adc8f115..b85c1f9f1288 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -562,10 +562,9 @@ static int netlink_alloc_groups(struct sock *sk)
         if (err)
                 return err;
 
-        nlk->groups = kmalloc(NLGRPSZ(groups), GFP_KERNEL);
+        nlk->groups = kzalloc(NLGRPSZ(groups), GFP_KERNEL);
         if (nlk->groups == NULL)
                 return -ENOMEM;
-        memset(nlk->groups, 0, NLGRPSZ(groups));
         nlk->ngroups = groups;
         return 0;
 }
@@ -1393,11 +1392,10 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
         struct sock *sk;
         struct netlink_sock *nlk;
 
-        cb = kmalloc(sizeof(*cb), GFP_KERNEL);
+        cb = kzalloc(sizeof(*cb), GFP_KERNEL);
         if (cb == NULL)
                 return -ENOBUFS;
 
-        memset(cb, 0, sizeof(*cb));
         cb->dump = dump;
         cb->done = done;
         cb->nlh = nlh;
@@ -1668,7 +1666,7 @@ static int netlink_seq_open(struct inode *inode, struct file *file)
         struct nl_seq_iter *iter;
         int err;
 
-        iter = kmalloc(sizeof(*iter), GFP_KERNEL);
+        iter = kzalloc(sizeof(*iter), GFP_KERNEL);
         if (!iter)
                 return -ENOMEM;
 
@@ -1678,7 +1676,6 @@ static int netlink_seq_open(struct inode *inode, struct file *file)
                 return err;
         }
 
-        memset(iter, 0, sizeof(*iter));
         seq = file->private_data;
         seq->private = iter;
         return 0;
@@ -1747,15 +1744,13 @@ static int __init netlink_proto_init(void)
         if (sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb))
                 netlink_skb_parms_too_large();
 
-        nl_table = kmalloc(sizeof(*nl_table) * MAX_LINKS, GFP_KERNEL);
+        nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);
         if (!nl_table) {
 enomem:
                 printk(KERN_CRIT "netlink_init: Cannot allocate nl_table\n");
                 return -ENOMEM;
         }
 
-        memset(nl_table, 0, sizeof(*nl_table) * MAX_LINKS);
-
         if (num_physpages >= (128 * 1024))
                 max = num_physpages >> (21 - PAGE_SHIFT);
         else