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

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

Merge "Revert "netfilter: Unlock xt_table later""

parents 45140c66 089ff079

net/ipv4/netfilter/arp_tables.c

+2 −1
Original line number Diff line number Diff line
@@ -921,6 +921,8 @@ 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 */
@@ -935,7 +937,6 @@ 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

+2 −1
Original line number Diff line number Diff line
@@ -1076,6 +1076,8 @@ __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 */
@@ -1089,7 +1091,6 @@ __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

+2 −1
Original line number Diff line number Diff line
@@ -1093,6 +1093,8 @@ __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 */
@@ -1106,7 +1108,6 @@ __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: