* [PATCH net] net: tun: unlink NAPI from device on destruction
@ 2022-06-23 4:20 Jakub Kicinski
2022-06-24 23:40 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Kicinski @ 2022-06-23 4:20 UTC (permalink / raw)
To: davem, edumazet
Cc: netdev, pabeni, Jakub Kicinski, syzbot+b75c138e9286ac742647,
peterpenkov96, maheshb
Syzbot found a race between tun file and device destruction.
NAPIs live in struct tun_file which can get destroyed before
the netdev so we have to del them explicitly. The current
code is missing deleting the NAPI if the queue was detached
first.
Fixes: 943170998b20 ("tun: enable NAPI for TUN/TAP driver")
Reported-by: syzbot+b75c138e9286ac742647@syzkaller.appspotmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: peterpenkov96@gmail.com
CC: maheshb@google.com
---
drivers/net/tun.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 87a635aac008..7fd0288c3789 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -727,6 +727,7 @@ static void tun_detach_all(struct net_device *dev)
sock_put(&tfile->sk);
}
list_for_each_entry_safe(tfile, tmp, &tun->disabled, next) {
+ tun_napi_del(tfile);
tun_enable_queue(tfile);
tun_queue_purge(tfile);
xdp_rxq_info_unreg(&tfile->xdp_rxq);
--
2.36.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: tun: unlink NAPI from device on destruction
2022-06-23 4:20 [PATCH net] net: tun: unlink NAPI from device on destruction Jakub Kicinski
@ 2022-06-24 23:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-06-24 23:40 UTC (permalink / raw)
To: Jakub Kicinski
Cc: davem, edumazet, netdev, pabeni, syzbot+b75c138e9286ac742647,
peterpenkov96, maheshb
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 22 Jun 2022 21:20:39 -0700 you wrote:
> Syzbot found a race between tun file and device destruction.
> NAPIs live in struct tun_file which can get destroyed before
> the netdev so we have to del them explicitly. The current
> code is missing deleting the NAPI if the queue was detached
> first.
>
> Fixes: 943170998b20 ("tun: enable NAPI for TUN/TAP driver")
> Reported-by: syzbot+b75c138e9286ac742647@syzkaller.appspotmail.com
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
>
> [...]
Here is the summary with links:
- [net] net: tun: unlink NAPI from device on destruction
https://git.kernel.org/netdev/net/c/3b9bc84d3111
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-24 23:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 4:20 [PATCH net] net: tun: unlink NAPI from device on destruction Jakub Kicinski
2022-06-24 23:40 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.