Commit f9006acc authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: arp_tables: pass table pointer via nf_hook_ops

Same change as previous patch.  Only difference:
no need to handle NULL template_ops parameter, the only caller
(arptable_filter) always passes non-NULL argument.

This removes all remaining accesses to net->ipv4.arptable_filter.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ae689334
...@@ -51,7 +51,7 @@ struct arpt_error { ...@@ -51,7 +51,7 @@ struct arpt_error {
extern void *arpt_alloc_initial_table(const struct xt_table *); extern void *arpt_alloc_initial_table(const struct xt_table *);
int arpt_register_table(struct net *net, const struct xt_table *table, int arpt_register_table(struct net *net, const struct xt_table *table,
const struct arpt_replace *repl, const struct arpt_replace *repl,
const struct nf_hook_ops *ops, struct xt_table **res); const struct nf_hook_ops *ops);
void arpt_unregister_table(struct net *net, const char *name); void arpt_unregister_table(struct net *net, const char *name);
void arpt_unregister_table_pre_exit(struct net *net, const char *name, void arpt_unregister_table_pre_exit(struct net *net, const char *name,
const struct nf_hook_ops *ops); const struct nf_hook_ops *ops);
......
...@@ -1499,10 +1499,11 @@ static void __arpt_unregister_table(struct net *net, struct xt_table *table) ...@@ -1499,10 +1499,11 @@ static void __arpt_unregister_table(struct net *net, struct xt_table *table)
int arpt_register_table(struct net *net, int arpt_register_table(struct net *net,
const struct xt_table *table, const struct xt_table *table,
const struct arpt_replace *repl, const struct arpt_replace *repl,
const struct nf_hook_ops *ops, const struct nf_hook_ops *template_ops)
struct xt_table **res)
{ {
int ret; struct nf_hook_ops *ops;
unsigned int num_ops;
int ret, i;
struct xt_table_info *newinfo; struct xt_table_info *newinfo;
struct xt_table_info bootstrap = {0}; struct xt_table_info bootstrap = {0};
void *loc_cpu_entry; void *loc_cpu_entry;
...@@ -1516,28 +1517,42 @@ int arpt_register_table(struct net *net, ...@@ -1516,28 +1517,42 @@ int arpt_register_table(struct net *net,
memcpy(loc_cpu_entry, repl->entries, repl->size); memcpy(loc_cpu_entry, repl->entries, repl->size);
ret = translate_table(net, newinfo, loc_cpu_entry, repl); ret = translate_table(net, newinfo, loc_cpu_entry, repl);
if (ret != 0) if (ret != 0) {
goto out_free; xt_free_table_info(newinfo);
return ret;
}
new_table = xt_register_table(net, table, &bootstrap, newinfo); new_table = xt_register_table(net, table, &bootstrap, newinfo);
if (IS_ERR(new_table)) { if (IS_ERR(new_table)) {
ret = PTR_ERR(new_table); xt_free_table_info(newinfo);
goto out_free; return PTR_ERR(new_table);
} }
/* set res now, will see skbs right after nf_register_net_hooks */ num_ops = hweight32(table->valid_hooks);
WRITE_ONCE(*res, new_table); if (num_ops == 0) {
ret = -EINVAL;
goto out_free;
}
ret = nf_register_net_hooks(net, ops, hweight32(table->valid_hooks)); ops = kmemdup(template_ops, sizeof(*ops) * num_ops, GFP_KERNEL);
if (ret != 0) { if (!ops) {
__arpt_unregister_table(net, new_table); ret = -ENOMEM;
*res = NULL; goto out_free;
} }
for (i = 0; i < num_ops; i++)
ops[i].priv = new_table;
new_table->ops = ops;
ret = nf_register_net_hooks(net, ops, num_ops);
if (ret != 0)
goto out_free;
return ret; return ret;
out_free: out_free:
xt_free_table_info(newinfo); __arpt_unregister_table(net, new_table);
return ret; return ret;
} }
......
...@@ -34,7 +34,7 @@ static unsigned int ...@@ -34,7 +34,7 @@ static unsigned int
arptable_filter_hook(void *priv, struct sk_buff *skb, arptable_filter_hook(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
return arpt_do_table(skb, state, state->net->ipv4.arptable_filter); return arpt_do_table(skb, state, priv);
} }
static struct nf_hook_ops *arpfilter_ops __read_mostly; static struct nf_hook_ops *arpfilter_ops __read_mostly;
...@@ -47,8 +47,7 @@ static int __net_init arptable_filter_table_init(struct net *net) ...@@ -47,8 +47,7 @@ static int __net_init arptable_filter_table_init(struct net *net)
repl = arpt_alloc_initial_table(&packet_filter); repl = arpt_alloc_initial_table(&packet_filter);
if (repl == NULL) if (repl == NULL)
return -ENOMEM; return -ENOMEM;
err = arpt_register_table(net, &packet_filter, repl, arpfilter_ops, err = arpt_register_table(net, &packet_filter, repl, arpfilter_ops);
&net->ipv4.arptable_filter);
kfree(repl); kfree(repl);
return err; return err;
} }
...@@ -61,7 +60,6 @@ static void __net_exit arptable_filter_net_pre_exit(struct net *net) ...@@ -61,7 +60,6 @@ static void __net_exit arptable_filter_net_pre_exit(struct net *net)
static void __net_exit arptable_filter_net_exit(struct net *net) static void __net_exit arptable_filter_net_exit(struct net *net)
{ {
arpt_unregister_table(net, "filter"); arpt_unregister_table(net, "filter");
net->ipv4.arptable_filter = NULL;
} }
static struct pernet_operations arptable_filter_net_ops = { static struct pernet_operations arptable_filter_net_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment