Skip to content

Commit aee12a0

Browse files
Florian Westphalummakynes
Florian Westphal
authored and
ummakynes
committed
ebtables: remove nf_hook_register usage
Similar to ip_register_table, pass nf_hook_ops to ebt_register_table(). This allows to handle hook registration also via pernet_ops and allows us to avoid use of legacy register_hook api. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 1a0ed0a commit aee12a0

File tree

5 files changed

+50
-51
lines changed

5 files changed

+50
-51
lines changed

‎include/linux/netfilter_bridge/ebtables.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ struct ebt_table {
109109
#define EBT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) & \
110110
~(__alignof__(struct _xt_align)-1))
111111
extern struct ebt_table *ebt_register_table(struct net *net,
112-
const struct ebt_table *table);
113-
extern void ebt_unregister_table(struct net *net, struct ebt_table *table);
112+
const struct ebt_table *table,
113+
const struct nf_hook_ops *);
114+
extern void ebt_unregister_table(struct net *net, struct ebt_table *table,
115+
const struct nf_hook_ops *);
114116
extern unsigned int ebt_do_table(struct sk_buff *skb,
115117
const struct nf_hook_state *state,
116118
struct ebt_table *table);

‎net/bridge/netfilter/ebtable_broute.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ static int ebt_broute(struct sk_buff *skb)
6565

6666
static int __net_init broute_net_init(struct net *net)
6767
{
68-
net->xt.broute_table = ebt_register_table(net, &broute_table);
68+
net->xt.broute_table = ebt_register_table(net, &broute_table, NULL);
6969
return PTR_ERR_OR_ZERO(net->xt.broute_table);
7070
}
7171

7272
static void __net_exit broute_net_exit(struct net *net)
7373
{
74-
ebt_unregister_table(net, net->xt.broute_table);
74+
ebt_unregister_table(net, net->xt.broute_table, NULL);
7575
}
7676

7777
static struct pernet_operations broute_net_ops = {

‎net/bridge/netfilter/ebtable_filter.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = {
9393

9494
static int __net_init frame_filter_net_init(struct net *net)
9595
{
96-
net->xt.frame_filter = ebt_register_table(net, &frame_filter);
96+
net->xt.frame_filter = ebt_register_table(net, &frame_filter, ebt_ops_filter);
9797
return PTR_ERR_OR_ZERO(net->xt.frame_filter);
9898
}
9999

100100
static void __net_exit frame_filter_net_exit(struct net *net)
101101
{
102-
ebt_unregister_table(net, net->xt.frame_filter);
102+
ebt_unregister_table(net, net->xt.frame_filter, ebt_ops_filter);
103103
}
104104

105105
static struct pernet_operations frame_filter_net_ops = {
@@ -109,20 +109,11 @@ static struct pernet_operations frame_filter_net_ops = {
109109

110110
static int __init ebtable_filter_init(void)
111111
{
112-
int ret;
113-
114-
ret = register_pernet_subsys(&frame_filter_net_ops);
115-
if (ret < 0)
116-
return ret;
117-
ret = nf_register_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
118-
if (ret < 0)
119-
unregister_pernet_subsys(&frame_filter_net_ops);
120-
return ret;
112+
return register_pernet_subsys(&frame_filter_net_ops);
121113
}
122114

123115
static void __exit ebtable_filter_fini(void)
124116
{
125-
nf_unregister_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
126117
unregister_pernet_subsys(&frame_filter_net_ops);
127118
}
128119

‎net/bridge/netfilter/ebtable_nat.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = {
9393

9494
static int __net_init frame_nat_net_init(struct net *net)
9595
{
96-
net->xt.frame_nat = ebt_register_table(net, &frame_nat);
96+
net->xt.frame_nat = ebt_register_table(net, &frame_nat, ebt_ops_nat);
9797
return PTR_ERR_OR_ZERO(net->xt.frame_nat);
9898
}
9999

100100
static void __net_exit frame_nat_net_exit(struct net *net)
101101
{
102-
ebt_unregister_table(net, net->xt.frame_nat);
102+
ebt_unregister_table(net, net->xt.frame_nat, ebt_ops_nat);
103103
}
104104

105105
static struct pernet_operations frame_nat_net_ops = {
@@ -109,20 +109,11 @@ static struct pernet_operations frame_nat_net_ops = {
109109

110110
static int __init ebtable_nat_init(void)
111111
{
112-
int ret;
113-
114-
ret = register_pernet_subsys(&frame_nat_net_ops);
115-
if (ret < 0)
116-
return ret;
117-
ret = nf_register_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
118-
if (ret < 0)
119-
unregister_pernet_subsys(&frame_nat_net_ops);
120-
return ret;
112+
return register_pernet_subsys(&frame_nat_net_ops);
121113
}
122114

123115
static void __exit ebtable_nat_fini(void)
124116
{
125-
nf_unregister_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
126117
unregister_pernet_subsys(&frame_nat_net_ops);
127118
}
128119

‎net/bridge/netfilter/ebtables.c

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,8 +1157,30 @@ static int do_replace(struct net *net, const void __user *user,
11571157
return ret;
11581158
}
11591159

1160+
static void __ebt_unregister_table(struct net *net, struct ebt_table *table)
1161+
{
1162+
int i;
1163+
1164+
mutex_lock(&ebt_mutex);
1165+
list_del(&table->list);
1166+
mutex_unlock(&ebt_mutex);
1167+
EBT_ENTRY_ITERATE(table->private->entries, table->private->entries_size,
1168+
ebt_cleanup_entry, net, NULL);
1169+
if (table->private->nentries)
1170+
module_put(table->me);
1171+
vfree(table->private->entries);
1172+
if (table->private->chainstack) {
1173+
for_each_possible_cpu(i)
1174+
vfree(table->private->chainstack[i]);
1175+
vfree(table->private->chainstack);
1176+
}
1177+
vfree(table->private);
1178+
kfree(table);
1179+
}
1180+
11601181
struct ebt_table *
1161-
ebt_register_table(struct net *net, const struct ebt_table *input_table)
1182+
ebt_register_table(struct net *net, const struct ebt_table *input_table,
1183+
const struct nf_hook_ops *ops)
11621184
{
11631185
struct ebt_table_info *newinfo;
11641186
struct ebt_table *t, *table;
@@ -1238,6 +1260,16 @@ ebt_register_table(struct net *net, const struct ebt_table *input_table)
12381260
}
12391261
list_add(&table->list, &net->xt.tables[NFPROTO_BRIDGE]);
12401262
mutex_unlock(&ebt_mutex);
1263+
1264+
if (!ops)
1265+
return table;
1266+
1267+
ret = nf_register_net_hooks(net, ops, hweight32(table->valid_hooks));
1268+
if (ret) {
1269+
__ebt_unregister_table(net, table);
1270+
return ERR_PTR(ret);
1271+
}
1272+
12411273
return table;
12421274
free_unlock:
12431275
mutex_unlock(&ebt_mutex);
@@ -1256,29 +1288,12 @@ ebt_register_table(struct net *net, const struct ebt_table *input_table)
12561288
return ERR_PTR(ret);
12571289
}
12581290

1259-
void ebt_unregister_table(struct net *net, struct ebt_table *table)
1291+
void ebt_unregister_table(struct net *net, struct ebt_table *table,
1292+
const struct nf_hook_ops *ops)
12601293
{
1261-
int i;
1262-
1263-
if (!table) {
1264-
BUGPRINT("Request to unregister NULL table!!!\n");
1265-
return;
1266-
}
1267-
mutex_lock(&ebt_mutex);
1268-
list_del(&table->list);
1269-
mutex_unlock(&ebt_mutex);
1270-
EBT_ENTRY_ITERATE(table->private->entries, table->private->entries_size,
1271-
ebt_cleanup_entry, net, NULL);
1272-
if (table->private->nentries)
1273-
module_put(table->me);
1274-
vfree(table->private->entries);
1275-
if (table->private->chainstack) {
1276-
for_each_possible_cpu(i)
1277-
vfree(table->private->chainstack[i]);
1278-
vfree(table->private->chainstack);
1279-
}
1280-
vfree(table->private);
1281-
kfree(table);
1294+
if (ops)
1295+
nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
1296+
__ebt_unregister_table(net, table);
12821297
}
12831298

12841299
/* userspace just supplied us with counters */

0 commit comments

Comments
 (0)