Skip to content

Commit 1230fe7

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: bpf: must hold reference on net namespace
BUG: KASAN: slab-use-after-free in __nf_unregister_net_hook+0x640/0x6b0 Read of size 8 at addr ffff8880106fe400 by task repro/72= bpf_nf_link_release+0xda/0x1e0 bpf_link_free+0x139/0x2d0 bpf_link_release+0x68/0x80 __fput+0x414/0xb60 Eric says: It seems that bpf was able to defer the __nf_unregister_net_hook() after exit()/close() time. Perhaps a netns reference is missing, because the netns has been dismantled/freed already. bpf_nf_link_attach() does : link->net = net; But I do not see a reference being taken on net. Add such a reference and release it after hook unreg. Note that I was unable to get syzbot reproducer to work, so I do not know if this resolves this splat. Fixes: 84601d6 ("bpf: add bpf_link support for BPF_NETFILTER programs") Diagnosed-by: Eric Dumazet <[email protected]> Reported-by: Lai, Yi <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent cb56079 commit 1230fe7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/netfilter/nf_bpf_link.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ static unsigned int nf_hook_run_bpf(void *bpf_prog, struct sk_buff *skb,
2323
struct bpf_nf_link {
2424
struct bpf_link link;
2525
struct nf_hook_ops hook_ops;
26+
netns_tracker ns_tracker;
2627
struct net *net;
2728
u32 dead;
2829
const struct nf_defrag_hook *defrag_hook;
@@ -120,6 +121,7 @@ static void bpf_nf_link_release(struct bpf_link *link)
120121
if (!cmpxchg(&nf_link->dead, 0, 1)) {
121122
nf_unregister_net_hook(nf_link->net, &nf_link->hook_ops);
122123
bpf_nf_disable_defrag(nf_link);
124+
put_net_track(nf_link->net, &nf_link->ns_tracker);
123125
}
124126
}
125127

@@ -257,6 +259,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
257259
return err;
258260
}
259261

262+
get_net_track(net, &link->ns_tracker, GFP_KERNEL);
263+
260264
return bpf_link_settle(&link_primer);
261265
}
262266

0 commit comments

Comments
 (0)