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

Commit dda46754 authored by Florian Westphal's avatar Florian Westphal Committed by Sasha Levin
Browse files

netfilter: x_tables: kill check_entry helper 



[ Upstream commit aa412ba225dd3bc36d404c28cdc3d674850d80d0 ]

Once we add more sanity testing to xt_check_entry_offsets it
becomes relvant if we're expecting a 32bit 'config_compat' blob
or a normal one.

Since we already have a lot of similar-named functions (check_entry,
compat_check_entry, find_and_check_entry, etc.) and the current
incarnation is short just fold its contents into the callers.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 62e6fd20

net/ipv4/netfilter/arp_tables.c

+8 −11
Original line number Diff line number Diff line
@@ -490,14 +490,6 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
	return 1;

}



static inline int check_entry(const struct arpt_entry *e)

{

	if (!arp_checkentry(&e->arp))

		return -EINVAL;



	return xt_check_entry_offsets(e, e->target_offset, e->next_offset);

}



static inline int check_target(struct arpt_entry *e, const char *name)

{

	struct xt_entry_target *t = arpt_get_target(e);
@@ -587,7 +579,10 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e, 
		return -EINVAL;

	}



	err = check_entry(e);

	if (!arp_checkentry(&e->arp))

		return -EINVAL;



	err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (err)

		return err;
@@ -1246,8 +1241,10 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e, 
		return -EINVAL;

	}



	/* For purposes of check_entry casting the compat entry is fine */

	ret = check_entry((struct arpt_entry *)e);

	if (!arp_checkentry(&e->arp))

		return -EINVAL;



	ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (ret)

		return ret;

net/ipv4/netfilter/ip_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -583,15 +583,6 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net) 
	module_put(par.match->me);

}



static int

check_entry(const struct ipt_entry *e)

{

	if (!ip_checkentry(&e->ip))

		return -EINVAL;



	return xt_check_entry_offsets(e, e->target_offset, e->next_offset);

}



static int

check_match(struct xt_entry_match *m, struct xt_mtchk_param *par)

{
@@ -748,7 +739,10 @@ check_entry_size_and_hooks(struct ipt_entry *e, 
		return -EINVAL;

	}



	err = check_entry(e);

	if (!ip_checkentry(&e->ip))

		return -EINVAL;



	err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (err)

		return err;
@@ -1512,8 +1506,10 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, 
		return -EINVAL;

	}



	/* For purposes of check_entry casting the compat entry is fine */

	ret = check_entry((struct ipt_entry *)e);

	if (!ip_checkentry(&e->ip))

		return -EINVAL;



	ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (ret)

		return ret;

net/ipv6/netfilter/ip6_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -593,15 +593,6 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net) 
	module_put(par.match->me);

}



static int

check_entry(const struct ip6t_entry *e)

{

	if (!ip6_checkentry(&e->ipv6))

		return -EINVAL;



	return xt_check_entry_offsets(e, e->target_offset, e->next_offset);

}



static int check_match(struct xt_entry_match *m, struct xt_mtchk_param *par)

{

	const struct ip6t_ip6 *ipv6 = par->entryinfo;
@@ -759,7 +750,10 @@ check_entry_size_and_hooks(struct ip6t_entry *e, 
		return -EINVAL;

	}



	err = check_entry(e);

	if (!ip6_checkentry(&e->ipv6))

		return -EINVAL;



	err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (err)

		return err;
@@ -1524,8 +1518,10 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, 
		return -EINVAL;

	}



	/* For purposes of check_entry casting the compat entry is fine */

	ret = check_entry((struct ip6t_entry *)e);

	if (!ip6_checkentry(&e->ipv6))

		return -EINVAL;



	ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);

	if (ret)

		return ret;