github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

netfilter: ebtables: use net_generic infra

Browse Source 
ebtables currently uses net->xt.tables[BRIDGE], but upcoming
patch will move net->xt.tables away from struct net.

To avoid exposing x_tables internals to ebtables, use a private list
instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2021-04-01 16:11:09 +02:00 committed by Pablo Neira Ayuso
parent 7b1957b049
commit 5b53951cfc
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/audit.h> #include <linux/audit.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/netns/generic.h>
/* needed for logical [in,out]-dev filtering */ /* needed for logical [in,out]-dev filtering */
#include "../br_private.h" #include "../br_private.h"
@ -39,8 +40,11 @@
#define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \ #define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \
COUNTER_OFFSET(n) * cpu)) COUNTER_OFFSET(n) * cpu))
struct ebt_pernet {
struct list_head tables;
};
static unsigned int ebt_pernet_id __read_mostly;
static DEFINE_MUTEX(ebt_mutex); static DEFINE_MUTEX(ebt_mutex);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
@ -336,7 +340,9 @@ static inline struct ebt_table *
find_table_lock(struct net *net, const char *name, int *error, find_table_lock(struct net *net, const char *name, int *error,
struct mutex *mutex) struct mutex *mutex)
{ {
return find_inlist_lock(&net->xt.tables[NFPROTO_BRIDGE], name, struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);
return find_inlist_lock(&ebt_net->tables, name,
"ebtable_", error, mutex); "ebtable_", error, mutex);
} }
@ -1136,6 +1142,7 @@ static void __ebt_unregister_table(struct net *net, struct ebt_table *table)
int ebt_register_table(struct net *net, const struct ebt_table *input_table, int ebt_register_table(struct net *net, const struct ebt_table *input_table,
const struct nf_hook_ops *ops, struct ebt_table **res) const struct nf_hook_ops *ops, struct ebt_table **res)
{ {
struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);
struct ebt_table_info *newinfo; struct ebt_table_info *newinfo;
struct ebt_table *t, *table; struct ebt_table *t, *table;
struct ebt_replace_kernel *repl; struct ebt_replace_kernel *repl;
@ -1194,7 +1201,7 @@ int ebt_register_table(struct net *net, const struct ebt_table *input_table,
table->private = newinfo; table->private = newinfo;
rwlock_init(&table->lock); rwlock_init(&table->lock);
mutex_lock(&ebt_mutex); mutex_lock(&ebt_mutex);
list_for_each_entry(t, &net->xt.tables[NFPROTO_BRIDGE], list) { list_for_each_entry(t, &ebt_net->tables, list) {
if (strcmp(t->name, table->name) == 0) { if (strcmp(t->name, table->name) == 0) {
ret = -EEXIST; ret = -EEXIST;
goto free_unlock; goto free_unlock;
@ -1206,7 +1213,7 @@ int ebt_register_table(struct net *net, const struct ebt_table *input_table,
ret = -ENOENT; ret = -ENOENT;
goto free_unlock; goto free_unlock;
} }
list_add(&table->list, &net->xt.tables[NFPROTO_BRIDGE]); list_add(&table->list, &ebt_net->tables);
mutex_unlock(&ebt_mutex); mutex_unlock(&ebt_mutex);
WRITE_ONCE(*res, table); WRITE_ONCE(*res, table);
@ -2412,6 +2419,20 @@ static struct nf_sockopt_ops ebt_sockopts = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __net_init ebt_pernet_init(struct net *net)
{
struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);
INIT_LIST_HEAD(&ebt_net->tables);
return 0;
}
static struct pernet_operations ebt_net_ops = {
.init = ebt_pernet_init,
.id = &ebt_pernet_id,
.size = sizeof(struct ebt_pernet),
};
static int __init ebtables_init(void) static int __init ebtables_init(void)
{ {
int ret; int ret;
@ -2425,13 +2446,21 @@ static int __init ebtables_init(void)
return ret; return ret;
} }
ret = register_pernet_subsys(&ebt_net_ops);
if (ret < 0) {
nf_unregister_sockopt(&ebt_sockopts);
xt_unregister_target(&ebt_standard_target);
return ret;
}
return 0; return 0;
} }
static void __exit ebtables_fini(void) static void ebtables_fini(void)
{ {
nf_unregister_sockopt(&ebt_sockopts); nf_unregister_sockopt(&ebt_sockopts);
xt_unregister_target(&ebt_standard_target); xt_unregister_target(&ebt_standard_target);
unregister_pernet_subsys(&ebt_net_ops);
} }
EXPORT_SYMBOL(ebt_register_table); EXPORT_SYMBOL(ebt_register_table);