Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed1a6f5e authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: ip6_tables: move counter allocation to seperate function 



More resyncing with ip_tables.c as preparation for compat support.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b84e92b

net/ipv6/netfilter/ip6_tables.c

+22 −9
Original line number Diff line number Diff line
@@ -943,17 +943,11 @@ get_counters(const struct xt_table_info *t, 
	}

}



static int

copy_entries_to_user(unsigned int total_size,

		     struct xt_table *table,

		     void __user *userptr)

static inline struct xt_counters *alloc_counters(struct xt_table *table)

{

	unsigned int off, num, countersize;

	struct ip6t_entry *e;

	unsigned int countersize;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;



	/* We need atomic snapshot of counters: rest doesn't change

	   (other than comefrom, which userspace doesn't care
@@ -962,13 +956,32 @@ copy_entries_to_user(unsigned int total_size, 
	counters = vmalloc_node(countersize, numa_node_id());



	if (counters == NULL)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	/* First, sum counters... */

	write_lock_bh(&table->lock);

	get_counters(private, counters);

	write_unlock_bh(&table->lock);



	return counters;

}



static int

copy_entries_to_user(unsigned int total_size,

		     struct xt_table *table,

		     void __user *userptr)

{

	unsigned int off, num;

	struct ip6t_entry *e;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;



	counters = alloc_counters(table);

	if (IS_ERR(counters))

		return PTR_ERR(counters);



	/* choose the copy that is on ourc node/cpu */

	loc_cpu_entry = private->entries[raw_smp_processor_id()];

	if (copy_to_user(userptr, loc_cpu_entry, total_size) != 0) {