5 files changed, 5 insertions, 10 deletions

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 3da9d73d1b52..27c7918e442a 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -177,7 +177,7 @@ static int ct_open(struct inode *inode, struct file *file)
         struct ct_iter_state *st;
         int ret;
 
-        st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
+        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
         if (st == NULL)
                 return -ENOMEM;
         ret = seq_open(file, &ct_seq_ops);
@@ -185,7 +185,6 @@ static int ct_open(struct inode *inode, struct file *file)
                 goto out_free;
         seq          = file->private_data;
         seq->private = st;
-        memset(st, 0, sizeof(struct ct_iter_state));
         return ret;
 out_free:
         kfree(st);
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index 16e850864b8a..2118de04fc35 100644
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/ieee80211_rate.c
@@ -24,11 +24,10 @@ int ieee80211_rate_control_register(struct rate_control_ops *ops)
 {
         struct rate_control_alg *alg;
 
-        alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+        alg = kzalloc(sizeof(*alg), GFP_KERNEL);
         if (alg == NULL) {
                 return -ENOMEM;
         }
-        memset(alg, 0, sizeof(*alg));
         alg->ops = ops;
 
         mutex_lock(&rate_ctrl_mutex);
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index ba2bf8f0a347..22b11786327a 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -1327,10 +1327,9 @@ ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_sta_bss *bss;
 
-        bss = kmalloc(sizeof(*bss), GFP_ATOMIC);
+        bss = kzalloc(sizeof(*bss), GFP_ATOMIC);
         if (!bss)
                 return NULL;
-        memset(bss, 0, sizeof(*bss));
         atomic_inc(&bss->users);
         atomic_inc(&bss->users);
         memcpy(bss->bssid, bssid, ETH_ALEN);
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index ffb6ff8c3528..fc847cc63be6 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -198,7 +198,7 @@ static int ct_open(struct inode *inode, struct file *file)
         struct ct_iter_state *st;
         int ret;
 
-        st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
+        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
         if (st == NULL)
                 return -ENOMEM;
         ret = seq_open(file, &ct_seq_ops);
@@ -206,7 +206,6 @@ static int ct_open(struct inode *inode, struct file *file)
                 goto out_free;
         seq          = file->private_data;
         seq->private = st;
-        memset(st, 0, sizeof(struct ct_iter_state));
         return ret;
 out_free:
         kfree(st);
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 9dfc9127acdd..d8473eefcd23 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -1052,12 +1052,11 @@ int tipc_nametbl_init(void)
 {
         int array_size = sizeof(struct hlist_head) * tipc_nametbl_size;
 
-        table.types = kmalloc(array_size, GFP_ATOMIC);
+        table.types = kzalloc(array_size, GFP_ATOMIC);
         if (!table.types)
                 return -ENOMEM;
 
         write_lock_bh(&tipc_nametbl_lock);
-        memset(table.types, 0, array_size);
         table.local_publ_count = 0;
         write_unlock_bh(&tipc_nametbl_lock);
         return 0;