lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: arp_tables: remove obsolete standard_check function

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

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2007-12-17 21:55:16 -08:00
committed by David S. Miller
parent 06e1374a7e
commit 03dafbbdf8
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net/ipv4/netfilter/arp_tables.c
View File

@@ -435,23 +435,6 @@ static int mark_source_chains(struct xt_table_info *newinfo,
return 1; 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, static inline int check_entry(struct arpt_entry *e, const char *name, unsigned int size,
unsigned int *i) unsigned int *i)
{ {
@@ -486,14 +469,9 @@ static inline int check_entry(struct arpt_entry *e, const char *name, unsigned i
if (ret) if (ret)
goto err; goto err;
if (t->u.kernel.target == &arpt_standard_target) { if (t->u.kernel.target->checkentry
if (!standard_check(t, size)) { && !t->u.kernel.target->checkentry(name, e, target, t->data,
ret = -EINVAL; e->comefrom)) {
goto err;
}
} else 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", duprintf("arp_tables: check failed for `%s'.\n",
t->u.kernel.target->name); t->u.kernel.target->name);
ret = -EINVAL; ret = -EINVAL;