Skip to content

Commit f9a4300

Browse files
committed
netfilter: nf_tables: double hook unregistration in netns 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+ Freescale#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 <[email protected]>
1 parent 3923b1e commit f9a4300

File tree

1 file changed

+41
-13
lines changed

1 file changed

+41
-13
lines changed

net/netfilter/nf_tables_api.c

+41-13
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,18 @@ static int nft_netdev_register_hooks(struct net *net,
222222
}
223223

224224
static void nft_netdev_unregister_hooks(struct net *net,
225-
struct list_head *hook_list)
225+
struct list_head *hook_list,
226+
bool release_netdev)
226227
{
227-
struct nft_hook *hook;
228+
struct nft_hook *hook, *next;
228229

229-
list_for_each_entry(hook, hook_list, list)
230+
list_for_each_entry_safe(hook, next, hook_list, list) {
230231
nf_unregister_net_hook(net, &hook->ops);
232+
if (release_netdev) {
233+
list_del(&hook->list);
234+
kfree_rcu(hook, rcu);
235+
}
236+
}
231237
}
232238

233239
static int nf_tables_register_hook(struct net *net,
@@ -253,9 +259,10 @@ static int nf_tables_register_hook(struct net *net,
253259
return nf_register_net_hook(net, &basechain->ops);
254260
}
255261

256-
static void nf_tables_unregister_hook(struct net *net,
257-
const struct nft_table *table,
258-
struct nft_chain *chain)
262+
static void __nf_tables_unregister_hook(struct net *net,
263+
const struct nft_table *table,
264+
struct nft_chain *chain,
265+
bool release_netdev)
259266
{
260267
struct nft_base_chain *basechain;
261268
const struct nf_hook_ops *ops;
@@ -270,11 +277,19 @@ static void nf_tables_unregister_hook(struct net *net,
270277
return basechain->type->ops_unregister(net, ops);
271278

272279
if (nft_base_chain_netdev(table->family, basechain->ops.hooknum))
273-
nft_netdev_unregister_hooks(net, &basechain->hook_list);
280+
nft_netdev_unregister_hooks(net, &basechain->hook_list,
281+
release_netdev);
274282
else
275283
nf_unregister_net_hook(net, &basechain->ops);
276284
}
277285

286+
static void nf_tables_unregister_hook(struct net *net,
287+
const struct nft_table *table,
288+
struct nft_chain *chain)
289+
{
290+
return __nf_tables_unregister_hook(net, table, chain, false);
291+
}
292+
278293
static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *trans)
279294
{
280295
struct nftables_pernet *nft_net = nft_pernet(net);
@@ -7307,13 +7322,25 @@ static void nft_unregister_flowtable_hook(struct net *net,
73077322
FLOW_BLOCK_UNBIND);
73087323
}
73097324

7310-
static void nft_unregister_flowtable_net_hooks(struct net *net,
7311-
struct list_head *hook_list)
7325+
static void __nft_unregister_flowtable_net_hooks(struct net *net,
7326+
struct list_head *hook_list,
7327+
bool release_netdev)
73127328
{
7313-
struct nft_hook *hook;
7329+
struct nft_hook *hook, *next;
73147330

7315-
list_for_each_entry(hook, hook_list, list)
7331+
list_for_each_entry_safe(hook, next, hook_list, list) {
73167332
nf_unregister_net_hook(net, &hook->ops);
7333+
if (release_netdev) {
7334+
list_del(&hook->list);
7335+
kfree_rcu(hook);
7336+
}
7337+
}
7338+
}
7339+
7340+
static void nft_unregister_flowtable_net_hooks(struct net *net,
7341+
struct list_head *hook_list)
7342+
{
7343+
__nft_unregister_flowtable_net_hooks(net, hook_list, false);
73177344
}
73187345

73197346
static int nft_register_flowtable_net_hooks(struct net *net,
@@ -9755,9 +9782,10 @@ static void __nft_release_hook(struct net *net, struct nft_table *table)
97559782
struct nft_chain *chain;
97569783

97579784
list_for_each_entry(chain, &table->chains, list)
9758-
nf_tables_unregister_hook(net, table, chain);
9785+
__nf_tables_unregister_hook(net, table, chain, true);
97599786
list_for_each_entry(flowtable, &table->flowtables, list)
9760-
nft_unregister_flowtable_net_hooks(net, &flowtable->hook_list);
9787+
__nft_unregister_flowtable_net_hooks(net, &flowtable->hook_list,
9788+
true);
97619789
}
97629790

97639791
static void __nft_release_hooks(struct net *net)

0 commit comments

Comments
 (0)