diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-06-22 21:20:39 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-24 16:28:08 -0700 |
| commit | 3b9bc84d311104906d2b4995a9a02d7b7ddab2db (patch) | |
| tree | 9f8fad5159f00663d624c89a19f827cdc26bc0f4 | |
| parent | tcp: add a missing nf_reset_ct() in 3WHS handling (diff) | |
| download | linux-dev-3b9bc84d311104906d2b4995a9a02d7b7ddab2db.tar.xz linux-dev-3b9bc84d311104906d2b4995a9a02d7b7ddab2db.zip | |
net: tun: unlink NAPI from device on destruction
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
Link: https://lore.kernel.org/r/20220623042039.2274708-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/tun.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |