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

Commit d2a7b6ba authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: make use of xt_request_find_target 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent ff67e4e4

net/bridge/netfilter/ebtables.c

+2 −11
Original line number Diff line number Diff line
@@ -395,13 +395,9 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct xt_tgchk_param *par, 
	   left - sizeof(struct ebt_entry_watcher) < w->watcher_size)

		return -EINVAL;



	watcher = try_then_request_module(

		  xt_find_target(NFPROTO_BRIDGE, w->u.name, 0),

		  "ebt_%s", w->u.name);

	watcher = xt_request_find_target(NFPROTO_BRIDGE, w->u.name, 0);

	if (IS_ERR(watcher))

		return PTR_ERR(watcher);

	if (watcher == NULL)

		return -ENOENT;

	w->u.watcher = watcher;



	par->target   = watcher;
@@ -714,15 +710,10 @@ ebt_check_entry(struct ebt_entry *e, struct net *net, 
	t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);

	gap = e->next_offset - e->target_offset;



	target = try_then_request_module(

		 xt_find_target(NFPROTO_BRIDGE, t->u.name, 0),

		 "ebt_%s", t->u.name);

	target = xt_request_find_target(NFPROTO_BRIDGE, t->u.name, 0);

	if (IS_ERR(target)) {

		ret = PTR_ERR(target);

		goto cleanup_watchers;

	} else if (target == NULL) {

		ret = -ENOENT;

		goto cleanup_watchers;

	}



	t->u.target = target;

net/ipv4/netfilter/arp_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -523,13 +523,11 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size) 
		return ret;



	t = arpt_get_target(e);

	target = try_then_request_module(xt_find_target(NFPROTO_ARP,

							t->u.user.name,

							t->u.user.revision),

					 "arpt_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_ARP, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("find_check_entry: `%s' not found\n", t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto out;

	}

	t->u.kernel.target = target;
@@ -1252,14 +1250,12 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e, 
	entry_offset = (void *)e - (void *)base;



	t = compat_arpt_get_target(e);

	target = try_then_request_module(xt_find_target(NFPROTO_ARP,

							t->u.user.name,

							t->u.user.revision),

					 "arpt_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_ARP, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("check_compat_entry_size_and_hooks: `%s' not found\n",

			 t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto out;

	}

	t->u.kernel.target = target;

net/ipv4/netfilter/ip_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -701,13 +701,11 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name, 
	}



	t = ipt_get_target(e);

	target = try_then_request_module(xt_find_target(AF_INET,

							t->u.user.name,

							t->u.user.revision),

					 "ipt_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_IPV4, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("find_check_entry: `%s' not found\n", t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto cleanup_matches;

	}

	t->u.kernel.target = target;
@@ -1547,14 +1545,12 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, 
	}



	t = compat_ipt_get_target(e);

	target = try_then_request_module(xt_find_target(AF_INET,

							t->u.user.name,

							t->u.user.revision),

					 "ipt_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_IPV4, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("check_compat_entry_size_and_hooks: `%s' not found\n",

			 t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto release_matches;

	}

	t->u.kernel.target = target;

net/ipv6/netfilter/ip6_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -733,13 +733,11 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name, 
	}



	t = ip6t_get_target(e);

	target = try_then_request_module(xt_find_target(AF_INET6,

							t->u.user.name,

							t->u.user.revision),

					 "ip6t_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_IPV6, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("find_check_entry: `%s' not found\n", t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto cleanup_matches;

	}

	t->u.kernel.target = target;
@@ -1581,14 +1579,12 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, 
	}



	t = compat_ip6t_get_target(e);

	target = try_then_request_module(xt_find_target(AF_INET6,

							t->u.user.name,

							t->u.user.revision),

					 "ip6t_%s", t->u.user.name);

	if (IS_ERR(target) || !target) {

	target = xt_request_find_target(NFPROTO_IPV6, t->u.user.name,

					t->u.user.revision);

	if (IS_ERR(target)) {

		duprintf("check_compat_entry_size_and_hooks: `%s' not found\n",

			 t->u.user.name);

		ret = target ? PTR_ERR(target) : -ENOENT;

		ret = PTR_ERR(target);

		goto release_matches;

	}

	t->u.kernel.target = target;

net/netfilter/x_tables.c

+1 −3
Original line number Diff line number Diff line
@@ -250,9 +250,7 @@ struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision) 


	target = try_then_request_module(xt_find_target(af, name, revision),

					 "%st_%s", xt_prefix[af], name);

	if (IS_ERR(target) || !target)

		return NULL;

	return target;

	return (target != NULL) ? target : ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL_GPL(xt_request_find_target);