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

Commit c47c7efc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "netfilter: Unlock xt_table later"

parents 85e65050 59318ed7

net/ipv4/netfilter/arp_tables.c

+1 −2
Original line number Diff line number Diff line
@@ -915,8 +915,6 @@ static int __do_replace(struct net *net, const char *name, 
	    (newinfo->number <= oldinfo->initial_entries))

		module_put(t->me);



	xt_table_unlock(t);



	get_old_counters(oldinfo, counters);



	/* Decrease module usage counts and free resource */
@@ -931,6 +929,7 @@ static int __do_replace(struct net *net, const char *name, 
		net_warn_ratelimited("arptables: counters copy to user failed while replacing table\n");

	}

	vfree(counters);

	xt_table_unlock(t);

	return ret;



 put_module:

net/ipv4/netfilter/ip_tables.c

+1 −2
Original line number Diff line number Diff line
@@ -1079,8 +1079,6 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
	    (newinfo->number <= oldinfo->initial_entries))

		module_put(t->me);



	xt_table_unlock(t);



	get_old_counters(oldinfo, counters);



	/* Decrease module usage counts and free resource */
@@ -1094,6 +1092,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
		net_warn_ratelimited("iptables: counters copy to user failed while replacing table\n");

	}

	vfree(counters);

	xt_table_unlock(t);

	return ret;



 put_module:

net/ipv6/netfilter/ip6_tables.c

+1 −2
Original line number Diff line number Diff line
@@ -1096,8 +1096,6 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
	    (newinfo->number <= oldinfo->initial_entries))

		module_put(t->me);



	xt_table_unlock(t);



	get_old_counters(oldinfo, counters);



	/* Decrease module usage counts and free resource */
@@ -1111,6 +1109,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
		net_warn_ratelimited("ip6tables: counters copy to user failed while replacing table\n");

	}

	vfree(counters);

	xt_table_unlock(t);

	return ret;



 put_module: