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

[EBTABLES]: Pull the loop doing __ebt_verify_pointers() into a separate function.

Browse Source 
It's easier to expand the iterator here *and* we'll be able to move all
uses of ebt_replace from translate_table() into this one.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro
2006-11-30 19:26:14 -08:00
committed by David S. Miller
parent 22b440bf9e
commit 70fe9af47e
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
net/bridge/netfilter/ebtables.c
View File

@@ -393,48 +393,54 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct ebt_entry *e,
return 0; return 0;
} }
static inline int static int ebt_verify_pointers(struct ebt_replace *repl,
__ebt_verify_pointers(struct ebt_entry *e, struct ebt_table_info *newinfo)
struct ebt_table_info *newinfo, char *base, char *limit,
struct ebt_entries **hook_entries,
unsigned int valid_hooks)
{ {
unsigned int offset = (char *)e - newinfo->entries; unsigned int limit = repl->entries_size;
size_t left = (limit - base) - offset; unsigned int valid_hooks = repl->valid_hooks;
unsigned int offset = 0;
int i; int i;
if (left < sizeof(unsigned int)) while (offset < limit) {
goto Esmall; size_t left = limit - offset;
struct ebt_entry *e = (void *)newinfo->entries + offset;
for (i = 0; i < NF_BR_NUMHOOKS; i++) { if (left < sizeof(unsigned int))
if ((valid_hooks & (1 << i)) == 0)
continue;
if ((char *)hook_entries[i] == base + offset)
break; break;
}
if (i != NF_BR_NUMHOOKS || !(e->bitmask & EBT_ENTRY_OR_ENTRIES)) {
if (e->bitmask != 0) {
/* we make userspace set this right,
so there is no misunderstanding */
BUGPRINT("EBT_ENTRY_OR_ENTRIES shouldn't be set "
"in distinguisher\n");
return -EINVAL;
}
if (left < sizeof(struct ebt_entries))
goto Esmall;
if (i != NF_BR_NUMHOOKS)
newinfo->hook_entry[i] = (struct ebt_entries *)e;
return 0;
}
if (left < sizeof(struct ebt_entry))
goto Esmall;
if (left < e->next_offset)
goto Esmall;
return 0;
Esmall: for (i = 0; i < NF_BR_NUMHOOKS; i++) {
BUGPRINT("entries_size too small\n"); if ((valid_hooks & (1 << i)) == 0)
return -EINVAL; continue;
if ((char *)repl->hook_entry[i] == repl->entries + offset)
break;
}
if (i != NF_BR_NUMHOOKS || !(e->bitmask & EBT_ENTRY_OR_ENTRIES)) {
if (e->bitmask != 0) {
/* we make userspace set this right,
so there is no misunderstanding */
BUGPRINT("EBT_ENTRY_OR_ENTRIES shouldn't be set "
"in distinguisher\n");
return -EINVAL;
}
if (i != NF_BR_NUMHOOKS)
newinfo->hook_entry[i] = (struct ebt_entries *)e;
if (left < sizeof(struct ebt_entries))
break;
offset += sizeof(struct ebt_entries);
} else {
if (left < sizeof(struct ebt_entry))
break;
if (left < e->next_offset)
break;
offset += e->next_offset;
}
}
if (offset != limit) {
BUGPRINT("entries_size too small\n");
return -EINVAL;
}
return 0;
} }
/* /*
@@ -795,9 +801,7 @@ static int translate_table(struct ebt_replace *repl,
newinfo->entries_size = repl->entries_size; newinfo->entries_size = repl->entries_size;
newinfo->nentries = repl->nentries; newinfo->nentries = repl->nentries;
ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ret = ebt_verify_pointers(repl, newinfo);
__ebt_verify_pointers, newinfo, repl->entries,
repl->entries + repl->entries_size, repl->hook_entry, repl->valid_hooks);
if (ret != 0) if (ret != 0)
return ret; return ret;