diff options
author | Patrick McHardy <kaber@trash.net> | 2007-12-17 21:48:33 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:58:33 -0800 |
commit | 3b84e92b0d54864b0731c3ab3c20dd140bb3d7d9 (patch) | |
tree | 9c8d218fd912224f4df2c8db5882973511a74a8d /net/ipv6 | |
parent | f173c8a1f2c0ca39f45bb15b82ad5e6fe908556d (diff) | |
download | op-kernel-dev-3b84e92b0d54864b0731c3ab3c20dd140bb3d7d9.zip op-kernel-dev-3b84e92b0d54864b0731c3ab3c20dd140bb3d7d9.tar.gz |
[NETFILTER]: ip6_tables: use vmalloc_node()
Consistently use vmalloc_node for all counter allocations.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 655c221..d0b5fa6 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -959,7 +959,7 @@ copy_entries_to_user(unsigned int total_size, (other than comefrom, which userspace doesn't care about). */ countersize = sizeof(struct xt_counters) * private->number; - counters = vmalloc(countersize); + counters = vmalloc_node(countersize, numa_node_id()); if (counters == NULL) return -ENOMEM; @@ -1080,7 +1080,8 @@ do_replace(void __user *user, unsigned int len) goto free_newinfo; } - counters = vmalloc(tmp.num_counters * sizeof(struct xt_counters)); + counters = vmalloc_node(tmp.num_counters * sizeof(struct xt_counters), + numa_node_id()); if (!counters) { ret = -ENOMEM; goto free_newinfo; @@ -1186,7 +1187,7 @@ do_add_counters(void __user *user, unsigned int len) if (len != sizeof(tmp) + tmp.num_counters*sizeof(struct xt_counters)) return -EINVAL; - paddc = vmalloc(len); + paddc = vmalloc_node(len, numa_node_id()); if (!paddc) return -ENOMEM; |