summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>2007-08-01 21:52:34 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-08-02 19:42:23 -0700
commit9f0d1a004d8d8c33d337d2b1cc9f0dc941cab627 (patch)
tree4f28c6d8672ebc3b7e95fadeb31b84e23d987f50
parent2f0812350e0e34f583919470b0517c2e368ee048 (diff)
downloadop-kernel-dev-9f0d1a004d8d8c33d337d2b1cc9f0dc941cab627.zip
op-kernel-dev-9f0d1a004d8d8c33d337d2b1cc9f0dc941cab627.tar.gz
[NETFILTER] nf_conntrack_expect.c: kmalloc + memset conversion to kzalloc
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/nf_conntrack_expect.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index eb6695d..3ac64e2 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -477,15 +477,14 @@ static int exp_open(struct inode *inode, struct file *file)
struct ct_expect_iter_state *st;
int ret;
- st = kmalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);
- if (st == NULL)
+ st = kzalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);
+ if (!st)
return -ENOMEM;
ret = seq_open(file, &exp_seq_ops);
if (ret)
goto out_free;
seq = file->private_data;
seq->private = st;
- memset(st, 0, sizeof(struct ct_expect_iter_state));
return ret;
out_free:
kfree(st);
OpenPOWER on IntegriCloud