net: tun: hold napi_mutex when deleting NAPI in tun_detach_all()
Subsystems (3)
PATCH 1/1 net: tun: hold napi_mutex when deleting NAPI in tun_detach_all()
With IFF_NAPI_FRAGS, tun_get_user() takes tfile->napi_mutex, gets the skb from napi_get_frags() and copies the user data into it before it enters the RCU read-side section around napi_gro_frags().
tun_detach_all() waits with synchronize_net() and then calls tun_napi_del() without napi_mutex. netif_napi_del() frees napi->skb through napi_free_frags(). A writer that is still copying has not yet entered its RCU section, so synchronize_net() does not wait for it, and deleting the device frees the skb while the writer is using it:
BUG: KASAN: slab-use-after-free in skb_copy_datagram_from_iter+0x175/0x720 Read of size 8 at addr ffff888077def990 by task br029-poc/9406 Call Trace: skb_copy_datagram_from_iter+0x175/0x720 tun_get_user+0xb42/0x3d00 tun_chr_write_iter+0x113/0x200 ... Freed by task 9405: kmem_cache_free+0x184/0x670 __netif_napi_del_locked+0x2bb/0x3c0 tun_net_uninit+0x566/0xa70 unregister_netdevice_many_notify+0x1a26/0x2090 rtnl_dellink+0x514/0x710
__tun_detach() also calls tun_napi_del() without the mutex, but only from tun_chr_close(), when no write on that file can be in flight.
Take napi_mutex around tun_napi_del() in tun_detach_all() for both attached and disabled queues.
--- drivers/net/tun.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/tun.c +4 -0
@@ -688,14 +688,18 @@ static void tun_detach_all(struct net_device *dev)synchronize_net ();for (i =0 ; i < n; i++) { tfile =rtnl_dereference (tun->tfiles[i]); +mutex_lock (&tfile->napi_mutex);tun_napi_del (tfile); +mutex_unlock (&tfile->napi_mutex);/* Drop read queue */ tun_queue_purge (tfile);xdp_rxq_info_unreg (&tfile->xdp_rxq);sock_put (&tfile->sk); }list_for_each_entry_safe (tfile, tmp, &tun->disabled, next) { +mutex_lock (&tfile->napi_mutex);tun_napi_del (tfile); +mutex_unlock (&tfile->napi_mutex);tun_enable_queue (tfile);tun_queue_purge (tfile);xdp_rxq_info_unreg (&tfile->xdp_rxq);
base-commit: f4377bf85887f57b59abb5479f7660a81ffe4449
Signature · 1 line
2.34.1
Quoted 27 lines · Cheng Yongkang
With
IFF_NAPI_FRAGS,tun_get_user()takestfile->napi_mutex, gets the skb fromnapi_get_frags()and copies the user data into it before it enters the RCU read-side section aroundnapi_gro_frags().
tun_detach_all()waits withsynchronize_net()and then callstun_napi_del()withoutnapi_mutex.netif_napi_del()freesnapi->skbthroughnapi_free_frags(). A writer that is still copying has not yet entered its RCU section, sosynchronize_net()does not wait for it, and deleting the device frees the skb while the writer is using it:BUG: KASAN: slab-use-after-free in skb_copy_datagram_from_iter+0x175/0x720 Read of size 8 at addr ffff888077def990 by task br029-poc/9406 Call Trace: skb_copy_datagram_from_iter+0x175/0x720 tun_get_user+0xb42/0x3d00 tun_chr_write_iter+0x113/0x200 ... Freed by task 9405: kmem_cache_free+0x184/0x670 __netif_napi_del_locked+0x2bb/0x3c0 tun_net_uninit+0x566/0xa70 unregister_netdevice_many_notify+0x1a26/0x2090 rtnl_dellink+0x514/0x710
__tun_detach()also callstun_napi_del()without the mutex, but only fromtun_chr_close(), when no write on that file can be in flight.
Quoted 6 lines
Take
napi_mutexaroundtun_napi_del()intun_detach_all()for both attached and disabled queues.Fixes 90e33d459407 ("tun: enable napi_gro_frags() for TUN/TAP driver")Assisted-by LLMSigned-off-by Cheng Yongkang <[email protected]>
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 11 lines · On Thu, 22 Oct 2026 08:26:48 -0700 you wrote:
With
IFF_NAPI_FRAGS,tun_get_user()takestfile->napi_mutex, gets the skb fromnapi_get_frags()and copies the user data into it before it enters the RCU read-side section aroundnapi_gro_frags().
tun_detach_all()waits withsynchronize_net()and then callstun_napi_del()withoutnapi_mutex.netif_napi_del()freesnapi->skbthroughnapi_free_frags(). A writer that is still copying has not yet entered its RCU section, sosynchronize_net()does not wait for it, and deleting the device frees the skb while the writer is using it:[...]
Here is the summary with links:
- [net] net: tun: hold napi_mutex when deleting NAPI in tun_detach_all()
https://git.kernel.org/netdev/net/c/6c799b4998c8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html