[NETFILTER] nfnetlink: Use kzalloc

These is a cleanup patch, kzalloc can be used in a couple of cases

Signed-off-by: Samir Bellabes <sbellabes@mandriva.com>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index efcd10f996b..d194676f365 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -146,11 +146,10 @@ instance_create(u_int16_t group_num, int pid)
                 goto out_unlock;
         }
 
-        inst = kmalloc(sizeof(*inst), GFP_ATOMIC);
+        inst = kzalloc(sizeof(*inst), GFP_ATOMIC);
         if (!inst)
                 goto out_unlock;
 
-        memset(inst, 0, sizeof(*inst));
         INIT_HLIST_NODE(&inst->hlist);
         inst->lock = SPIN_LOCK_UNLOCKED;
         /* needs to be two, since we _put() after creation */
@@ -962,10 +961,9 @@ static int nful_open(struct inode *inode, struct file *file)
         struct iter_state *is;
         int ret;
 
-        is = kmalloc(sizeof(*is), GFP_KERNEL);
+        is = kzalloc(sizeof(*is), GFP_KERNEL);
         if (!is)
                 return -ENOMEM;
-        memset(is, 0, sizeof(*is));
         ret = seq_open(file, &nful_seq_ops);
         if (ret < 0)
                 goto out_free;
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index eaa44c49567..f065a6c9495 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -136,11 +136,10 @@ instance_create(u_int16_t queue_num, int pid)
                 goto out_unlock;
         }
 
-        inst = kmalloc(sizeof(*inst), GFP_ATOMIC);
+        inst = kzalloc(sizeof(*inst), GFP_ATOMIC);
         if (!inst)
                 goto out_unlock;
 
-        memset(inst, 0, sizeof(*inst));
         inst->queue_num = queue_num;
         inst->peer_pid = pid;
         inst->queue_maxlen = NFQNL_QMAX_DEFAULT;
@@ -1036,10 +1035,9 @@ static int nfqnl_open(struct inode *inode, struct file *file)
         struct iter_state *is;
         int ret;
 
-        is = kmalloc(sizeof(*is), GFP_KERNEL);
+        is = kzalloc(sizeof(*is), GFP_KERNEL);
         if (!is)
                 return -ENOMEM;
-        memset(is, 0, sizeof(*is));
         ret = seq_open(file, &nfqnl_seq_ops);
         if (ret < 0)
                 goto out_free;