summaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-05-28 10:36:35 -0700
committerJiri Kosina <jkosina@suse.cz>2011-09-15 13:59:25 +0200
commit3dbd4439837f2cfd2ff302897353f4b1b6263b2a (patch)
treee67bc84d5d4708fb8bc60a92709d89d3d811e46b /net/netfilter
parent8c1fec1ba83b7ce20b65a492a6e73e8d524aed88 (diff)
net: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/x_tables.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index b0869fe3633b..71441b934ffd 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i)
size = sizeof(void **) * nr_cpu_ids;
if (size > PAGE_SIZE)
- i->jumpstack = vmalloc(size);
+ i->jumpstack = vzalloc(size);
else
- i->jumpstack = kmalloc(size, GFP_KERNEL);
+ i->jumpstack = kzalloc(size, GFP_KERNEL);
if (i->jumpstack == NULL)
return -ENOMEM;
- memset(i->jumpstack, 0, size);
i->stacksize *= xt_jumpstack_multiplier;
size = sizeof(void *) * i->stacksize;