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

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

[NETFILTER]: arp_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 fb5b6095

net/ipv4/netfilter/arp_tables.c

+21 −8
Original line number Original line Diff line number Diff line
@@ -706,16 +706,11 @@ static void get_counters(const struct xt_table_info *t, 
	}

	}

}

}





static int copy_entries_to_user(unsigned int total_size,

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

				struct arpt_table *table,

				void __user *userptr)

{

{

	unsigned int off, num, countersize;

	unsigned int countersize;

	struct arpt_entry *e;

	struct xt_counters *counters;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;





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

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

	 * (other than comefrom, which userspace doesn't care

	 * (other than comefrom, which userspace doesn't care
@@ -725,13 +720,31 @@ static int copy_entries_to_user(unsigned int total_size, 
	counters = vmalloc_node(countersize, numa_node_id());

	counters = vmalloc_node(countersize, numa_node_id());





	if (counters == NULL)

	if (counters == NULL)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);





	/* First, sum counters... */

	/* First, sum counters... */

	write_lock_bh(&table->lock);

	write_lock_bh(&table->lock);

	get_counters(private, counters);

	get_counters(private, counters);

	write_unlock_bh(&table->lock);

	write_unlock_bh(&table->lock);





	return counters;

}



static int copy_entries_to_user(unsigned int total_size,

				struct arpt_table *table,

				void __user *userptr)

{

	unsigned int off, num;

	struct arpt_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);



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

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

	/* ... then copy entire thing ... */

	/* ... then copy entire thing ... */

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

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