lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER] nfnetlink: Use kzalloc

Browse Source 
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>
This commit is contained in:
Harald Welte
2005-11-03 19:20:07 +01:00
committed by Arnaldo Carvalho de Melo
parent 0f81eb4db4
commit 10dfdc69ea
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/nfnetlink_log.c
View File

@@ -146,11 +146,10 @@ instance_create(u_int16_t group_num, int pid)
goto out_unlock; goto out_unlock;
} }
inst = kmalloc(sizeof(*inst), GFP_ATOMIC); inst = kzalloc(sizeof(*inst), GFP_ATOMIC);
if (!inst) if (!inst)
goto out_unlock; goto out_unlock;
memset(inst, 0, sizeof(*inst));
INIT_HLIST_NODE(&inst->hlist); INIT_HLIST_NODE(&inst->hlist);
inst->lock = SPIN_LOCK_UNLOCKED; inst->lock = SPIN_LOCK_UNLOCKED;
/* needs to be two, since we _put() after creation */ /* 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; struct iter_state *is;
int ret; int ret;
is = kmalloc(sizeof(*is), GFP_KERNEL); is = kzalloc(sizeof(*is), GFP_KERNEL);
if (!is) if (!is)
return -ENOMEM; return -ENOMEM;
memset(is, 0, sizeof(*is));
ret = seq_open(file, &nful_seq_ops); ret = seq_open(file, &nful_seq_ops);
if (ret < 0) if (ret < 0)
goto out_free; goto out_free;

6
net/netfilter/nfnetlink_queue.c
View File

@@ -136,11 +136,10 @@ instance_create(u_int16_t queue_num, int pid)
goto out_unlock; goto out_unlock;
} }
inst = kmalloc(sizeof(*inst), GFP_ATOMIC); inst = kzalloc(sizeof(*inst), GFP_ATOMIC);
if (!inst) if (!inst)
goto out_unlock; goto out_unlock;
memset(inst, 0, sizeof(*inst));
inst->queue_num = queue_num; inst->queue_num = queue_num;
inst->peer_pid = pid; inst->peer_pid = pid;
inst->queue_maxlen = NFQNL_QMAX_DEFAULT; inst->queue_maxlen = NFQNL_QMAX_DEFAULT;
@@ -1036,10 +1035,9 @@ static int nfqnl_open(struct inode *inode, struct file *file)
struct iter_state *is; struct iter_state *is;
int ret; int ret;
is = kmalloc(sizeof(*is), GFP_KERNEL); is = kzalloc(sizeof(*is), GFP_KERNEL);
if (!is) if (!is)
return -ENOMEM; return -ENOMEM;
memset(is, 0, sizeof(*is));
ret = seq_open(file, &nfqnl_seq_ops); ret = seq_open(file, &nfqnl_seq_ops);
if (ret < 0) if (ret < 0)
goto out_free; goto out_free;