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

Commit 03dafbbd authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: arp_tables: remove obsolete standard_check function 



The size check is already performed by xt_check_target, no need
to do it again.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06e1374a

net/ipv4/netfilter/arp_tables.c

+3 −25
Original line number Diff line number Diff line
@@ -435,23 +435,6 @@ static int mark_source_chains(struct xt_table_info *newinfo, 
	return 1;

}



static inline int standard_check(const struct arpt_entry_target *t,

				 unsigned int max_offset)

{

	/* Check standard info. */

	if (t->u.target_size

	    != ARPT_ALIGN(sizeof(struct arpt_standard_target))) {

		duprintf("arpt_standard_check: target size %u != %Zu\n",

			 t->u.target_size,

			 ARPT_ALIGN(sizeof(struct arpt_standard_target)));

		return 0;

	}



	return 1;

}



static struct arpt_target arpt_standard_target;



static inline int check_entry(struct arpt_entry *e, const char *name, unsigned int size,

			      unsigned int *i)

{
@@ -486,12 +469,7 @@ static inline int check_entry(struct arpt_entry *e, const char *name, unsigned i 
	if (ret)

		goto err;



	if (t->u.kernel.target == &arpt_standard_target) {

		if (!standard_check(t, size)) {

			ret = -EINVAL;

			goto err;

		}

	} else if (t->u.kernel.target->checkentry

	if (t->u.kernel.target->checkentry

	    && !t->u.kernel.target->checkentry(name, e, target, t->data,

					       e->comefrom)) {

		duprintf("arp_tables: check failed for `%s'.\n",