leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NETFILTER]: arp_tables: move entry and target checks to seperate functions

Browse Source 
Resync with ip_tables.c as preparation for compat support.

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:56:33 -08:00 committed by David S. Miller
parent 70f0bfcf6a
commit fb5b6095f3
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,12 +435,9 @@ static int mark_source_chains(struct xt_table_info *newinfo,
return 1; return 1;
} }
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 *i)
{ {
struct arpt_entry_target *t; struct arpt_entry_target *t;
struct arpt_target *target;
int ret;
if (!arp_checkentry(&e->arp)) { if (!arp_checkentry(&e->arp)) {
duprintf("arp_tables: arp check failed %p %s.\n", e, name); duprintf("arp_tables: arp check failed %p %s.\n", e, name);
@ -454,29 +451,56 @@ static inline int check_entry(struct arpt_entry *e, const char *name, unsigned i
if (e->target_offset + t->u.target_size > e->next_offset) if (e->target_offset + t->u.target_size > e->next_offset)
return -EINVAL; return -EINVAL;
target = try_then_request_module(xt_find_target(NF_ARP, t->u.user.name, return 0;
t->u.user.revision), }
"arpt_%s", t->u.user.name);
if (IS_ERR(target) || !target) { static inline int check_target(struct arpt_entry *e, const char *name)
duprintf("check_entry: `%s' not found\n", t->u.user.name); {
ret = target ? PTR_ERR(target) : -ENOENT; struct arpt_entry_target *t;
goto out; struct arpt_target *target;
} int ret;
t->u.kernel.target = target;
t = arpt_get_target(e);
target = t->u.kernel.target;
ret = xt_check_target(target, NF_ARP, t->u.target_size - sizeof(*t), ret = xt_check_target(target, NF_ARP, t->u.target_size - sizeof(*t),
name, e->comefrom, 0, 0); name, e->comefrom, 0, 0);
if (ret) if (!ret && t->u.kernel.target->checkentry
goto err;
if (t->u.kernel.target->checkentry
&& !t->u.kernel.target->checkentry(name, e, target, t->data, && !t->u.kernel.target->checkentry(name, e, target, t->data,
e->comefrom)) { 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;
goto err;
} }
return ret;
}
static inline int
find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
unsigned int *i)
{
struct arpt_entry_target *t;
struct arpt_target *target;
int ret;
ret = check_entry(e, name);
if (ret)
return ret;
t = arpt_get_target(e);
target = try_then_request_module(xt_find_target(NF_ARP, t->u.user.name,
t->u.user.revision),
"arpt_%s", t->u.user.name);
if (IS_ERR(target) || !target) {
duprintf("find_check_entry: `%s' not found\n", t->u.user.name);
ret = target ? PTR_ERR(target) : -ENOENT;
goto out;
}
t->u.kernel.target = target;
ret = check_target(e, name);
if (ret)
goto err;
(*i)++; (*i)++;
return 0; return 0;
@ -611,7 +635,7 @@ static int translate_table(const char *name,
/* Finally, each sanity check must pass */ /* Finally, each sanity check must pass */
i = 0; i = 0;
ret = ARPT_ENTRY_ITERATE(entry0, newinfo->size, ret = ARPT_ENTRY_ITERATE(entry0, newinfo->size,
check_entry, name, size, &i); find_check_entry, name, size, &i);
if (ret != 0) { if (ret != 0) {
ARPT_ENTRY_ITERATE(entry0, newinfo->size, ARPT_ENTRY_ITERATE(entry0, newinfo->size,