]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: ip6_tables: use vmalloc_node()
authorPatrick McHardy <kaber@trash.net>
Tue, 18 Dec 2007 05:48:33 +0000 (21:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:58:33 +0000 (14:58 -0800)
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>
net/ipv6/netfilter/ip6_tables.c

index 655c221acd1a91efc787b52fbf76e27c909fe1f6..d0b5fa6661f59afec3a9efe070168d3516db6036 100644 (file)
@@ -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;