diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-06-22 21:21:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-07 17:35:10 +0200 |
| commit | e90525753e3cf0566ac4917ae98785ff478ede0c (patch) | |
| tree | 573bad5a77169ced53440794503d543413bc0876 | |
| parent | 82e729aee59acefe135fceffadcbc5b86dd4f1b9 (diff) | |
| download | linux-e90525753e3cf0566ac4917ae98785ff478ede0c.tar.gz linux-e90525753e3cf0566ac4917ae98785ff478ede0c.tar.bz2 linux-e90525753e3cf0566ac4917ae98785ff478ede0c.zip | |
net: tun: stop NAPI when detaching queues
commit a8fc8cb5692aebb9c6f7afd4265366d25dcd1d01 upstream.
While looking at a syzbot report I noticed the NAPI only gets
disabled before it's deleted. I think that user can detach
the queue before destroying the device and the NAPI will never
be stopped.
Fixes: 943170998b20 ("tun: enable NAPI for TUN/TAP driver")
Acked-by: Petar Penkov <ppenkov@aviatrix.com>
Link: https://lore.kernel.org/r/20220623042105.2274812-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/tun.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6dd956f4b604..c455545885ca 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -333,6 +333,12 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile, } } +static void tun_napi_enable(struct tun_file *tfile) +{ + if (tfile->napi_enabled) + napi_enable(&tfile->napi); +} + static void tun_napi_disable(struct tun_file *tfile) { if (tfile->napi_enabled) @@ -723,8 +729,10 @@ static void __tun_detach(struct tun_file *tfile, bool clean) if (clean) { RCU_INIT_POINTER(tfile->tun, NULL); sock_put(&tfile->sk); - } else + } else { tun_disable_queue(tun, tfile); + tun_napi_disable(tfile); + } synchronize_net(); tun_flow_delete_by_queue(tun, tun->numqueues + 1); @@ -878,6 +886,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file, if (tfile->detached) { tun_enable_queue(tfile); + tun_napi_enable(tfile); } else { sock_hold(&tfile->sk); tun_napi_init(tun, tfile, napi, napi_frags); |