Skip to content

Commit 3fac8ce

Browse files
ummakynesgregkh
authored andcommitted
netfilter: nf_tables: double hook unregistration in netns path
commit f9a4300 upstream. [ This backport includes ab5e5c0 ("netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path") ] __nft_release_hooks() is called from pre_netns exit path which unregisters the hooks, then the NETDEV_UNREGISTER event is triggered which unregisters the hooks again. [ 565.221461] WARNING: CPU: 18 PID: 193 at net/netfilter/core.c:495 __nf_unregister_net_hook+0x247/0x270 [...] [ 565.246890] CPU: 18 PID: 193 Comm: kworker/u64:1 Tainted: G E 5.18.0-rc7+ #27 [ 565.253682] Workqueue: netns cleanup_net [ 565.257059] RIP: 0010:__nf_unregister_net_hook+0x247/0x270 [...] [ 565.297120] Call Trace: [ 565.300900] <TASK> [ 565.304683] nf_tables_flowtable_event+0x16a/0x220 [nf_tables] [ 565.308518] raw_notifier_call_chain+0x63/0x80 [ 565.312386] unregister_netdevice_many+0x54f/0xb50 Unregister and destroy netdev hook from netns pre_exit via kfree_rcu so the NETDEV_UNREGISTER path see unregistered hooks. Fixes: 767d121 ("netfilter: nftables: fix possible UAF over chains from packet path in netns") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent e51f308 commit 3fac8ce

File tree

1 file changed

+41
-13
lines changed

1 file changed

+41
-13
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,18 @@ static int nft_netdev_register_hooks(struct net *net,
303303
}
304304

305305
static void nft_netdev_unregister_hooks(struct net *net,
306-
struct list_head *hook_list)
306+
struct list_head *hook_list,
307+
bool release_netdev)
307308
{
308-
struct nft_hook *hook;
309+
struct nft_hook *hook, *next;
309310

310-
list_for_each_entry(hook, hook_list, list)
311+
list_for_each_entry_safe(hook, next, hook_list, list) {
311312
nf_unregister_net_hook(net, &hook->ops);
313+
if (release_netdev) {
314+
list_del(&hook->list);
315+
kfree_rcu(hook, rcu);
316+
}
317+
}
312318
}
313319

314320
static int nf_tables_register_hook(struct net *net,
@@ -334,9 +340,10 @@ static int nf_tables_register_hook(struct net *net,
334340
return nf_register_net_hook(net, &basechain->ops);
335341
}
336342

337-
static void nf_tables_unregister_hook(struct net *net,
338-
const struct nft_table *table,
339-
struct nft_chain *chain)
343+
static void __nf_tables_unregister_hook(struct net *net,
344+
const struct nft_table *table,
345+
struct nft_chain *chain,
346+
bool release_netdev)
340347
{
341348
struct nft_base_chain *basechain;
342349
const struct nf_hook_ops *ops;
@@ -351,11 +358,19 @@ static void nf_tables_unregister_hook(struct net *net,
351358
return basechain->type->ops_unregister(net, ops);
352359

353360
if (nft_base_chain_netdev(table->family, basechain->ops.hooknum))
354-
nft_netdev_unregister_hooks(net, &basechain->hook_list);
361+
nft_netdev_unregister_hooks(net, &basechain->hook_list,
362+
release_netdev);
355363
else
356364
nf_unregister_net_hook(net, &basechain->ops);
357365
}
358366

367+
static void nf_tables_unregister_hook(struct net *net,
368+
const struct nft_table *table,
369+
struct nft_chain *chain)
370+
{
371+
return __nf_tables_unregister_hook(net, table, chain, false);
372+
}
373+
359374
static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *trans)
360375
{
361376
struct nftables_pernet *nft_net;
@@ -6822,13 +6837,25 @@ static void nft_unregister_flowtable_hook(struct net *net,
68226837
FLOW_BLOCK_UNBIND);
68236838
}
68246839

6825-
static void nft_unregister_flowtable_net_hooks(struct net *net,
6826-
struct list_head *hook_list)
6840+
static void __nft_unregister_flowtable_net_hooks(struct net *net,
6841+
struct list_head *hook_list,
6842+
bool release_netdev)
68276843
{
6828-
struct nft_hook *hook;
6844+
struct nft_hook *hook, *next;
68296845

6830-
list_for_each_entry(hook, hook_list, list)
6846+
list_for_each_entry_safe(hook, next, hook_list, list) {
68316847
nf_unregister_net_hook(net, &hook->ops);
6848+
if (release_netdev) {
6849+
list_del(&hook->list);
6850+
kfree_rcu(hook, rcu);
6851+
}
6852+
}
6853+
}
6854+
6855+
static void nft_unregister_flowtable_net_hooks(struct net *net,
6856+
struct list_head *hook_list)
6857+
{
6858+
__nft_unregister_flowtable_net_hooks(net, hook_list, false);
68326859
}
68336860

68346861
static int nft_register_flowtable_net_hooks(struct net *net,
@@ -9472,9 +9499,10 @@ static void __nft_release_hook(struct net *net, struct nft_table *table)
94729499
struct nft_chain *chain;
94739500

94749501
list_for_each_entry(chain, &table->chains, list)
9475-
nf_tables_unregister_hook(net, table, chain);
9502+
__nf_tables_unregister_hook(net, table, chain, true);
94769503
list_for_each_entry(flowtable, &table->flowtables, list)
9477-
nft_unregister_flowtable_net_hooks(net, &flowtable->hook_list);
9504+
__nft_unregister_flowtable_net_hooks(net, &flowtable->hook_list,
9505+
true);
94789506
}
94799507

94809508
static void __nft_release_hooks(struct net *net)

0 commit comments

Comments
 (0)