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

Commit 03d13b68 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: xtables: add and use xt_request_find_table_lock 



currently we always return -ENOENT to userspace if we can't find
a particular table, or if the table initialization fails.

Followup patch will make nat table init fail in case nftables already
registered a nat hook so this change makes xt_find_table_lock return
an ERR_PTR to return the errno value reported from the table init
function.

Add xt_request_find_table_lock as try_then_request_module replacement
and use it where needed.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 256d94ba

include/linux/netfilter/x_tables.h

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ int xt_find_revision(u8 af, const char *name, u8 revision, int target, 


struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af,

				    const char *name);

struct xt_table *xt_request_find_table_lock(struct net *net, u_int8_t af,

					    const char *name);

void xt_table_unlock(struct xt_table *t);



int xt_proto_init(struct net *net, u_int8_t af);

net/ipv4/netfilter/arp_tables.c

+12 −14
Original line number Diff line number Diff line
@@ -810,9 +810,8 @@ static int get_info(struct net *net, void __user *user, 
	if (compat)

		xt_compat_lock(NFPROTO_ARP);

#endif

	t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name),

				    "arptable_%s", name);

	if (t) {

	t = xt_request_find_table_lock(net, NFPROTO_ARP, name);

	if (!IS_ERR(t)) {

		struct arpt_getinfo info;

		const struct xt_table_info *private = t->private;

#ifdef CONFIG_COMPAT
@@ -841,7 +840,7 @@ static int get_info(struct net *net, void __user *user, 
		xt_table_unlock(t);

		module_put(t->me);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);

#ifdef CONFIG_COMPAT

	if (compat)

		xt_compat_unlock(NFPROTO_ARP);
@@ -866,7 +865,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr, 
	get.name[sizeof(get.name) - 1] = '\0';



	t = xt_find_table_lock(net, NFPROTO_ARP, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;



		if (get.size == private->size)
@@ -878,7 +877,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	return ret;

}
@@ -903,10 +902,9 @@ static int __do_replace(struct net *net, const char *name, 
		goto out;

	}



	t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name),

				    "arptable_%s", name);

	if (!t) {

		ret = -ENOENT;

	t = xt_request_find_table_lock(net, NFPROTO_ARP, name);

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free_newinfo_counters_untrans;

	}
@@ -1020,8 +1018,8 @@ static int do_add_counters(struct net *net, const void __user *user, 
		return PTR_ERR(paddc);



	t = xt_find_table_lock(net, NFPROTO_ARP, tmp.name);

	if (!t) {

		ret = -ENOENT;

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free;

	}
@@ -1408,7 +1406,7 @@ static int compat_get_entries(struct net *net, 


	xt_compat_lock(NFPROTO_ARP);

	t = xt_find_table_lock(net, NFPROTO_ARP, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;
@@ -1423,7 +1421,7 @@ static int compat_get_entries(struct net *net, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	xt_compat_unlock(NFPROTO_ARP);

	return ret;

net/ipv4/netfilter/ip_tables.c

+12 −14
Original line number Diff line number Diff line
@@ -973,9 +973,8 @@ static int get_info(struct net *net, void __user *user, 
	if (compat)

		xt_compat_lock(AF_INET);

#endif

	t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),

				    "iptable_%s", name);

	if (t) {

	t = xt_request_find_table_lock(net, AF_INET, name);

	if (!IS_ERR(t)) {

		struct ipt_getinfo info;

		const struct xt_table_info *private = t->private;

#ifdef CONFIG_COMPAT
@@ -1005,7 +1004,7 @@ static int get_info(struct net *net, void __user *user, 
		xt_table_unlock(t);

		module_put(t->me);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);

#ifdef CONFIG_COMPAT

	if (compat)

		xt_compat_unlock(AF_INET);
@@ -1030,7 +1029,7 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr, 
	get.name[sizeof(get.name) - 1] = '\0';



	t = xt_find_table_lock(net, AF_INET, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		if (get.size == private->size)

			ret = copy_entries_to_user(private->size,
@@ -1041,7 +1040,7 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	return ret;

}
@@ -1064,10 +1063,9 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
		goto out;

	}



	t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),

				    "iptable_%s", name);

	if (!t) {

		ret = -ENOENT;

	t = xt_request_find_table_lock(net, AF_INET, name);

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free_newinfo_counters_untrans;

	}
@@ -1181,8 +1179,8 @@ do_add_counters(struct net *net, const void __user *user, 
		return PTR_ERR(paddc);



	t = xt_find_table_lock(net, AF_INET, tmp.name);

	if (!t) {

		ret = -ENOENT;

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free;

	}
@@ -1625,7 +1623,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr, 


	xt_compat_lock(AF_INET);

	t = xt_find_table_lock(net, AF_INET, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;

		ret = compat_table_info(private, &info);
@@ -1639,7 +1637,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	xt_compat_unlock(AF_INET);

	return ret;

net/ipv6/netfilter/ip6_tables.c

+12 −14
Original line number Diff line number Diff line
@@ -991,9 +991,8 @@ static int get_info(struct net *net, void __user *user, 
	if (compat)

		xt_compat_lock(AF_INET6);

#endif

	t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name),

				    "ip6table_%s", name);

	if (t) {

	t = xt_request_find_table_lock(net, AF_INET6, name);

	if (!IS_ERR(t)) {

		struct ip6t_getinfo info;

		const struct xt_table_info *private = t->private;

#ifdef CONFIG_COMPAT
@@ -1023,7 +1022,7 @@ static int get_info(struct net *net, void __user *user, 
		xt_table_unlock(t);

		module_put(t->me);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);

#ifdef CONFIG_COMPAT

	if (compat)

		xt_compat_unlock(AF_INET6);
@@ -1049,7 +1048,7 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr, 
	get.name[sizeof(get.name) - 1] = '\0';



	t = xt_find_table_lock(net, AF_INET6, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		if (get.size == private->size)

			ret = copy_entries_to_user(private->size,
@@ -1060,7 +1059,7 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	return ret;

}
@@ -1083,10 +1082,9 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
		goto out;

	}



	t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name),

				    "ip6table_%s", name);

	if (!t) {

		ret = -ENOENT;

	t = xt_request_find_table_lock(net, AF_INET6, name);

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free_newinfo_counters_untrans;

	}
@@ -1199,8 +1197,8 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len, 
	if (IS_ERR(paddc))

		return PTR_ERR(paddc);

	t = xt_find_table_lock(net, AF_INET6, tmp.name);

	if (!t) {

		ret = -ENOENT;

	if (IS_ERR(t)) {

		ret = PTR_ERR(t);

		goto free;

	}
@@ -1636,7 +1634,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr, 


	xt_compat_lock(AF_INET6);

	t = xt_find_table_lock(net, AF_INET6, get.name);

	if (t) {

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;

		ret = compat_table_info(private, &info);
@@ -1650,7 +1648,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr, 
		module_put(t->me);

		xt_table_unlock(t);

	} else

		ret = -ENOENT;

		ret = PTR_ERR(t);



	xt_compat_unlock(AF_INET6);

	return ret;

net/netfilter/x_tables.c

+27 −9
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ void xt_free_table_info(struct xt_table_info *info) 
}

EXPORT_SYMBOL(xt_free_table_info);



/* Find table by name, grabs mutex & ref.  Returns NULL on error. */

/* Find table by name, grabs mutex & ref.  Returns ERR_PTR on error. */

struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af,

				    const char *name)

{
@@ -1043,17 +1043,17 @@ struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af, 


	/* Table doesn't exist in this netns, re-try init */

	list_for_each_entry(t, &init_net.xt.tables[af], list) {

		int err;



		if (strcmp(t->name, name))

			continue;

		if (!try_module_get(t->me)) {

			mutex_unlock(&xt[af].mutex);

			return NULL;

		}



		if (!try_module_get(t->me))

			goto out;

		mutex_unlock(&xt[af].mutex);

		if (t->table_init(net) != 0) {

		err = t->table_init(net);

		if (err < 0) {

			module_put(t->me);

			return NULL;

			return ERR_PTR(err);

		}



		found = t;
@@ -1073,10 +1073,28 @@ struct xt_table *xt_find_table_lock(struct net *net, u_int8_t af, 
	module_put(found->me);

 out:

	mutex_unlock(&xt[af].mutex);

	return NULL;

	return ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL_GPL(xt_find_table_lock);



struct xt_table *xt_request_find_table_lock(struct net *net, u_int8_t af,

					    const char *name)

{

	struct xt_table *t = xt_find_table_lock(net, af, name);



#ifdef CONFIG_MODULE

	if (IS_ERR(t)) {

		int err = request_module("%stable_%s", xt_prefix[af], name);

		if (err)

			return ERR_PTR(err);

		t = xt_find_table_lock(net, af, name);

	}

#endif



	return t;

}

EXPORT_SYMBOL_GPL(xt_request_find_table_lock);



void xt_table_unlock(struct xt_table *table)

{

	mutex_unlock(&xt[table->af].mutex);