netfilter: xtables: reduce arguments to translate_table
Just pass in the entire repl struct. In case of a new table (e.g. ip6t_register_table), the repldata has been previously filled with table->name and table->size already (in ip6t_alloc_initial_table). Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
6bdb331bc6
commit
0f234214d1
|
@ -622,21 +622,15 @@ static inline void cleanup_entry(struct arpt_entry *e)
|
|||
/* Checks and translates the user-supplied table segment (held in
|
||||
* newinfo).
|
||||
*/
|
||||
static int translate_table(const char *name,
|
||||
unsigned int valid_hooks,
|
||||
struct xt_table_info *newinfo,
|
||||
void *entry0,
|
||||
unsigned int size,
|
||||
unsigned int number,
|
||||
const unsigned int *hook_entries,
|
||||
const unsigned int *underflows)
|
||||
static int translate_table(struct xt_table_info *newinfo, void *entry0,
|
||||
const struct arpt_replace *repl)
|
||||
{
|
||||
struct arpt_entry *iter;
|
||||
unsigned int i;
|
||||
int ret = 0;
|
||||
|
||||
newinfo->size = size;
|
||||
newinfo->number = number;
|
||||
newinfo->size = repl->size;
|
||||
newinfo->number = repl->num_entries;
|
||||
|
||||
/* Init all hooks to impossible value. */
|
||||
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
|
||||
|
@ -650,7 +644,8 @@ static int translate_table(const char *name,
|
|||
/* Walk through entries, checking offsets. */
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = check_entry_size_and_hooks(iter, newinfo, entry0,
|
||||
entry0 + size, hook_entries, underflows, valid_hooks);
|
||||
entry0 + repl->size, repl->hook_entry, repl->underflow,
|
||||
repl->valid_hooks);
|
||||
if (ret != 0)
|
||||
break;
|
||||
++i;
|
||||
|
@ -659,30 +654,30 @@ static int translate_table(const char *name,
|
|||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
if (i != number) {
|
||||
if (i != repl->num_entries) {
|
||||
duprintf("translate_table: %u not %u entries\n",
|
||||
i, number);
|
||||
i, repl->num_entries);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Check hooks all assigned */
|
||||
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
|
||||
/* Only hooks which are valid */
|
||||
if (!(valid_hooks & (1 << i)))
|
||||
if (!(repl->valid_hooks & (1 << i)))
|
||||
continue;
|
||||
if (newinfo->hook_entry[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid hook entry %u %u\n",
|
||||
i, hook_entries[i]);
|
||||
i, repl->hook_entry[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (newinfo->underflow[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid underflow %u %u\n",
|
||||
i, underflows[i]);
|
||||
i, repl->underflow[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!mark_source_chains(newinfo, valid_hooks, entry0)) {
|
||||
if (!mark_source_chains(newinfo, repl->valid_hooks, entry0)) {
|
||||
duprintf("Looping hook\n");
|
||||
return -ELOOP;
|
||||
}
|
||||
|
@ -690,7 +685,7 @@ static int translate_table(const char *name,
|
|||
/* Finally, each sanity check must pass */
|
||||
i = 0;
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = find_check_entry(iter, name, size);
|
||||
ret = find_check_entry(iter, repl->name, repl->size);
|
||||
if (ret != 0)
|
||||
break;
|
||||
++i;
|
||||
|
@ -1101,9 +1096,7 @@ static int do_replace(struct net *net, const void __user *user,
|
|||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_table(tmp.name, tmp.valid_hooks,
|
||||
newinfo, loc_cpu_entry, tmp.size, tmp.num_entries,
|
||||
tmp.hook_entry, tmp.underflow);
|
||||
ret = translate_table(newinfo, loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
|
@ -1795,12 +1788,7 @@ struct xt_table *arpt_register_table(struct net *net,
|
|||
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
|
||||
memcpy(loc_cpu_entry, repl->entries, repl->size);
|
||||
|
||||
ret = translate_table(table->name, table->valid_hooks,
|
||||
newinfo, loc_cpu_entry, repl->size,
|
||||
repl->num_entries,
|
||||
repl->hook_entry,
|
||||
repl->underflow);
|
||||
|
||||
ret = translate_table(newinfo, loc_cpu_entry, repl);
|
||||
duprintf("arpt_register_table: translate table gives %d\n", ret);
|
||||
if (ret != 0)
|
||||
goto out_free;
|
||||
|
|
|
@ -815,22 +815,15 @@ cleanup_entry(struct ipt_entry *e, struct net *net)
|
|||
/* Checks and translates the user-supplied table segment (held in
|
||||
newinfo) */
|
||||
static int
|
||||
translate_table(struct net *net,
|
||||
const char *name,
|
||||
unsigned int valid_hooks,
|
||||
struct xt_table_info *newinfo,
|
||||
void *entry0,
|
||||
unsigned int size,
|
||||
unsigned int number,
|
||||
const unsigned int *hook_entries,
|
||||
const unsigned int *underflows)
|
||||
translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0,
|
||||
const struct ipt_replace *repl)
|
||||
{
|
||||
struct ipt_entry *iter;
|
||||
unsigned int i;
|
||||
int ret = 0;
|
||||
|
||||
newinfo->size = size;
|
||||
newinfo->number = number;
|
||||
newinfo->size = repl->size;
|
||||
newinfo->number = repl->num_entries;
|
||||
|
||||
/* Init all hooks to impossible value. */
|
||||
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
|
||||
|
@ -843,42 +836,43 @@ translate_table(struct net *net,
|
|||
/* Walk through entries, checking offsets. */
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = check_entry_size_and_hooks(iter, newinfo, entry0,
|
||||
entry0 + size, hook_entries, underflows, valid_hooks);
|
||||
entry0 + repl->size, repl->hook_entry, repl->underflow,
|
||||
repl->valid_hooks);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
++i;
|
||||
}
|
||||
|
||||
if (i != number) {
|
||||
if (i != repl->num_entries) {
|
||||
duprintf("translate_table: %u not %u entries\n",
|
||||
i, number);
|
||||
i, repl->num_entries);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Check hooks all assigned */
|
||||
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
|
||||
/* Only hooks which are valid */
|
||||
if (!(valid_hooks & (1 << i)))
|
||||
if (!(repl->valid_hooks & (1 << i)))
|
||||
continue;
|
||||
if (newinfo->hook_entry[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid hook entry %u %u\n",
|
||||
i, hook_entries[i]);
|
||||
i, repl->hook_entry[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (newinfo->underflow[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid underflow %u %u\n",
|
||||
i, underflows[i]);
|
||||
i, repl->underflow[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!mark_source_chains(newinfo, valid_hooks, entry0))
|
||||
if (!mark_source_chains(newinfo, repl->valid_hooks, entry0))
|
||||
return -ELOOP;
|
||||
|
||||
/* Finally, each sanity check must pass */
|
||||
i = 0;
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = find_check_entry(iter, net, name, size);
|
||||
ret = find_check_entry(iter, net, repl->name, repl->size);
|
||||
if (ret != 0)
|
||||
break;
|
||||
++i;
|
||||
|
@ -1311,9 +1305,7 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
|
|||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_table(net, tmp.name, tmp.valid_hooks,
|
||||
newinfo, loc_cpu_entry, tmp.size, tmp.num_entries,
|
||||
tmp.hook_entry, tmp.underflow);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
|
@ -2112,11 +2104,7 @@ struct xt_table *ipt_register_table(struct net *net,
|
|||
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
|
||||
memcpy(loc_cpu_entry, repl->entries, repl->size);
|
||||
|
||||
ret = translate_table(net, table->name, table->valid_hooks,
|
||||
newinfo, loc_cpu_entry, repl->size,
|
||||
repl->num_entries,
|
||||
repl->hook_entry,
|
||||
repl->underflow);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, repl);
|
||||
if (ret != 0)
|
||||
goto out_free;
|
||||
|
||||
|
|
|
@ -845,22 +845,15 @@ static void cleanup_entry(struct ip6t_entry *e, struct net *net)
|
|||
/* Checks and translates the user-supplied table segment (held in
|
||||
newinfo) */
|
||||
static int
|
||||
translate_table(struct net *net,
|
||||
const char *name,
|
||||
unsigned int valid_hooks,
|
||||
struct xt_table_info *newinfo,
|
||||
void *entry0,
|
||||
unsigned int size,
|
||||
unsigned int number,
|
||||
const unsigned int *hook_entries,
|
||||
const unsigned int *underflows)
|
||||
translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0,
|
||||
const struct ip6t_replace *repl)
|
||||
{
|
||||
struct ip6t_entry *iter;
|
||||
unsigned int i;
|
||||
int ret = 0;
|
||||
|
||||
newinfo->size = size;
|
||||
newinfo->number = number;
|
||||
newinfo->size = repl->size;
|
||||
newinfo->number = repl->num_entries;
|
||||
|
||||
/* Init all hooks to impossible value. */
|
||||
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
|
||||
|
@ -873,42 +866,43 @@ translate_table(struct net *net,
|
|||
/* Walk through entries, checking offsets. */
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = check_entry_size_and_hooks(iter, newinfo, entry0,
|
||||
entry0 + size, hook_entries, underflows, valid_hooks);
|
||||
entry0 + repl->size, repl->hook_entry, repl->underflow,
|
||||
repl->valid_hooks);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
++i;
|
||||
}
|
||||
|
||||
if (i != number) {
|
||||
if (i != repl->num_entries) {
|
||||
duprintf("translate_table: %u not %u entries\n",
|
||||
i, number);
|
||||
i, repl->num_entries);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Check hooks all assigned */
|
||||
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
|
||||
/* Only hooks which are valid */
|
||||
if (!(valid_hooks & (1 << i)))
|
||||
if (!(repl->valid_hooks & (1 << i)))
|
||||
continue;
|
||||
if (newinfo->hook_entry[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid hook entry %u %u\n",
|
||||
i, hook_entries[i]);
|
||||
i, repl->hook_entry[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (newinfo->underflow[i] == 0xFFFFFFFF) {
|
||||
duprintf("Invalid underflow %u %u\n",
|
||||
i, underflows[i]);
|
||||
i, repl->underflow[i]);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!mark_source_chains(newinfo, valid_hooks, entry0))
|
||||
if (!mark_source_chains(newinfo, repl->valid_hooks, entry0))
|
||||
return -ELOOP;
|
||||
|
||||
/* Finally, each sanity check must pass */
|
||||
i = 0;
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = find_check_entry(iter, net, name, size);
|
||||
ret = find_check_entry(iter, net, repl->name, repl->size);
|
||||
if (ret != 0)
|
||||
break;
|
||||
++i;
|
||||
|
@ -1342,9 +1336,7 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
|
|||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_table(net, tmp.name, tmp.valid_hooks,
|
||||
newinfo, loc_cpu_entry, tmp.size, tmp.num_entries,
|
||||
tmp.hook_entry, tmp.underflow);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
|
@ -2145,11 +2137,7 @@ struct xt_table *ip6t_register_table(struct net *net,
|
|||
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
|
||||
memcpy(loc_cpu_entry, repl->entries, repl->size);
|
||||
|
||||
ret = translate_table(net, table->name, table->valid_hooks,
|
||||
newinfo, loc_cpu_entry, repl->size,
|
||||
repl->num_entries,
|
||||
repl->hook_entry,
|
||||
repl->underflow);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, repl);
|
||||
if (ret != 0)
|
||||
goto out_free;
|
||||
|
||||
|
|
Loading…
Reference in a new issue