tun: address two syzbot reports
Subsystems (3)
cover tun: address two syzbot reports
Small changes addressing races discovered by syzbot.
First patch is a cleanup.
Second patch moves a mutex init sooner.
Third patch makes sure each tfile gets its own napi enable flags.
Eric Dumazet (3):
tun: remove unused parameters
tun: initialize napi_mutex unconditionally
tun: napi flags belong to tfile
drivers/net/tun.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
Signature · 1 line
2.19.0.605.g01d371f741-goog
PATCH 1/3 tun: remove unused parameters
tun_napi_disable() and tun_napi_del() do not need
a pointer to the tun_struct
--- drivers/net/tun.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/tun.c +6 -6
@@ -324,13 +324,13 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile, } } -static void tun_napi_disable (struct tun_struct *tun,struct tun_file *tfile) +static void tun_napi_disable (struct tun_file *tfile) {if (tfile->napi_enabled)napi_disable (&tfile->napi); } -static void tun_napi_del (struct tun_struct *tun,struct tun_file *tfile) +static void tun_napi_del (struct tun_file *tfile) {if (tfile->napi_enabled)netif_napi_del (&tfile->napi);
@@ -690,8 +690,8 @@ static void __tun_detach(struct tun_file *tfile, bool clean) tun =rtnl_dereference (tfile->tun);if (tun && clean) { -tun_napi_disable (tun, tfile); -tun_napi_del (tun, tfile); +tun_napi_disable (tfile); +tun_napi_del (tfile); }if (tun && !tfile->detached) {
@@ -758,7 +758,7 @@ static void tun_detach_all(struct net_device *dev)for (i =0 ; i < n; i++) { tfile =rtnl_dereference (tun->tfiles[i]);BUG_ON (!tfile); -tun_napi_disable (tun, tfile); +tun_napi_disable (tfile); tfile->socket.sk->sk_shutdown =RCV_SHUTDOWN ; tfile->socket.sk->sk_data_ready (tfile->socket.sk);RCU_INIT_POINTER (tfile->tun,NULL );
@@ -774,7 +774,7 @@ static void tun_detach_all(struct net_device *dev)synchronize_net ();for (i =0 ; i < n; i++) { tfile =rtnl_dereference (tun->tfiles[i]); -tun_napi_del (tun, tfile); +tun_napi_del (tfile);/* Drop read queue */ tun_queue_purge (tfile);xdp_rxq_info_unreg (&tfile->xdp_rxq);
Signature · 1 line
2.19.0.605.g01d371f741-goog
PATCH 2/3 tun: initialize napi_mutex unconditionally
In reply to Eric DumazetThis is the first part to fix following syzbot report :
console output: https://syzkaller.appspot.com/x/log.txt?x=145378e6400000 kernel config: https://syzkaller.appspot.com/x/.config?x=443816db871edd66 dashboard link: https://syzkaller.appspot.com/bug?extid=e662df0ac1d753b57e80
Following patch is fixing the race condition, but it seems safer to initialize this mutex at tfile creation anyway.
--- drivers/net/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/tun.c +1 -1
@@ -320,7 +320,6 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile,netif_napi_add (tun->dev, &tfile->napi, tun_napi_poll,NAPI_POLL_WEIGHT );napi_enable (&tfile->napi); -mutex_init (&tfile->napi_mutex); } }
@@ -3199,6 +3198,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)return -ENOMEM ; } +mutex_init (&tfile->napi_mutex);RCU_INIT_POINTER (tfile->tun,NULL ); tfile->flags =0 ; tfile->ifindex =0 ;
Signature · 1 line
2.19.0.605.g01d371f741-goog
PATCH 3/3 tun: napi flags belong to tfile
In reply to Eric DumazetSince tun->flags might be shared by multiple tfile structures, it is better to make sure tun_get_user() is using the flags for the current tfile.
Presence of the READ_ONCE() in tun_napi_frags_enabled() gave a hint of what could happen, but we need something stronger to please syzbot.
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN CPU: 0 PID: 13647 Comm: syz-executor5 Not tainted 4.19.0-rc5+ #59 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:dev_gro_receive+0x132/0x2720 net/core/dev.c:5427 Code: 48 c1 ea 03 80 3c 02 00 0f 85 6e 20 00 00 48 b8 00 00 00 00 00 fc ff df 4d 8b 6e 10 49 8d bd d0 00 00 00 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 59 20 00 00 4d 8b a5 d0 00 00 00 31 ff 41 81 e4 RSP: 0018:ffff8801c400f410 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff8618d325 RDX: 000000000000001a RSI: ffffffff86189f97 RDI: 00000000000000d0 RBP: ffff8801c400f608 R08: ffff8801c8fb4300 R09: 0000000000000000 R10: ffffed0038801ed7 R11: 0000000000000003 R12: ffff8801d327d358 R13: 0000000000000000 R14: ffff8801c16dd8c0 R15: 0000000000000004 FS: 00007fe003615700(0000) GS:ffff8801dac00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fe1f3c43db8 CR3: 00000001bebb2000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: napi_gro_frags+0x3f4/0xc90 net/core/dev.c:5715 tun_get_user+0x31d5/0x42a0 drivers/net/tun.c:1922 tun_chr_write_iter+0xb9/0x154 drivers/net/tun.c:1967 call_write_iter include/linux/fs.h:1808 [inline] new_sync_write fs/read_write.c:474 [inline] __vfs_write+0x6b8/0x9f0 fs/read_write.c:487 vfs_write+0x1fc/0x560 fs/read_write.c:549 ksys_write+0x101/0x260 fs/read_write.c:598 __do_sys_write fs/read_write.c:610 [inline] __se_sys_write fs/read_write.c:607 [inline] __x64_sys_write+0x73/0xb0 fs/read_write.c:607 do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x457579 Code: 1d b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 eb b3 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fe003614c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000457579 RDX: 0000000000000012 RSI: 0000000020000000 RDI: 000000000000000a RBP: 000000000072c040 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe0036156d4 R13: 00000000004c5574 R14: 00000000004d8e98 R15: 00000000ffffffff Modules linked in: RIP: 0010:dev_gro_receive+0x132/0x2720 net/core/dev.c:5427 Code: 48 c1 ea 03 80 3c 02 00 0f 85 6e 20 00 00 48 b8 00 00 00 00 00 fc ff df 4d 8b 6e 10 49 8d bd d0 00 00 00 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 59 20 00 00 4d 8b a5 d0 00 00 00 31 ff 41 81 e4 RSP: 0018:ffff8801c400f410 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff8618d325 RDX: 000000000000001a RSI: ffffffff86189f97 RDI: 00000000000000d0 RBP: ffff8801c400f608 R08: ffff8801c8fb4300 R09: 0000000000000000 R10: ffffed0038801ed7 R11: 0000000000000003 R12: ffff8801d327d358 R13: 0000000000000000 R14: ffff8801c16dd8c0 R15: 0000000000000004 FS: 00007fe003615700(0000) GS:ffff8801dac00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fe1f3c43db8 CR3: 00000001bebb2000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- drivers/net/tun.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/net/tun.c +14 -9
@@ -181,6 +181,7 @@ struct tun_file { };struct napi_struct napi;bool napi_enabled; +bool napi_frags_enabled;struct mutex napi_mutex;/* Protects access to the above napi */ struct list_head next;struct tun_struct *detached;
@@ -313,9 +314,10 @@ static int tun_napi_poll(struct napi_struct *napi, int budget) }static void tun_napi_init (struct tun_struct *tun,struct tun_file *tfile, -bool napi_en) +bool napi_en,bool napi_frags) { tfile->napi_enabled = napi_en; + tfile->napi_frags_enabled = napi_en && napi_frags;if (napi_en) {netif_napi_add (tun->dev, &tfile->napi, tun_napi_poll,NAPI_POLL_WEIGHT );
@@ -335,9 +337,9 @@ static void tun_napi_del(struct tun_file *tfile)netif_napi_del (&tfile->napi); } -static bool tun_napi_frags_enabled (const struct tun_struct *tun) +static bool tun_napi_frags_enabled (const struct tun_file *tfile) { -return READ_ONCE (tun->flags) &IFF_NAPI_FRAGS ; +return tfile->napi_frags_enabled; }#ifdef CONFIG_TUN_VNET_CROSS_LE
@@ -792,7 +794,7 @@ static void tun_detach_all(struct net_device *dev) }static int tun_attach (struct tun_struct *tun,struct file *file, -bool skip_filter,bool napi) +bool skip_filter,bool napi,bool napi_frags) {struct tun_file *tfile = file->private_data;struct net_device *dev = tun->dev;
@@ -865,7 +867,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file,tun_enable_queue (tfile); }else {sock_hold (&tfile->sk); -tun_napi_init (tun, tfile, napi); +tun_napi_init (tun, tfile, napi, napi_frags); }tun_set_real_num_queues (tun);
@@ -1708,7 +1710,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,int err;u32 rxhash =0 ;int skb_xdp =1 ; -bool frags =tun_napi_frags_enabled (tun); +bool frags =tun_napi_frags_enabled (tfile);if (!(tun->dev->flags &IFF_UP ))return -EIO ;
@@ -2533,7 +2535,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)return err; err =tun_attach (tun, file, ifr->ifr_flags &IFF_NOFILTER , - ifr->ifr_flags &IFF_NAPI ); + ifr->ifr_flags &IFF_NAPI , + ifr->ifr_flags &IFF_NAPI_FRAGS );if (err <0 )return err;
@@ -2631,7 +2634,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) (ifr->ifr_flags &TUN_FEATURES );INIT_LIST_HEAD (&tun->disabled); - err =tun_attach (tun, file, false, ifr->ifr_flags &IFF_NAPI ); + err =tun_attach (tun, file, false, ifr->ifr_flags &IFF_NAPI , + ifr->ifr_flags &IFF_NAPI_FRAGS );if (err <0 ) goto err_free_flow;
@@ -2780,7 +2784,8 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) ret =security_tun_dev_attach_queue (tun->security);if (ret <0 ) goto unlock; - ret =tun_attach (tun, file, false, tun->flags &IFF_NAPI ); + ret =tun_attach (tun, file, false, tun->flags &IFF_NAPI , + tun->flags &IFF_NAPI_FRAGS ); }else if (ifr->ifr_flags &IFF_DETACH_QUEUE ) { tun =rtnl_dereference (tfile->tun);if (!tun || !(tun->flags &IFF_MULTI_QUEUE ) || tfile->detached)
Signature · 1 line
2.19.0.605.g01d371f741-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Fri, 28 Sep 2018 14:51:46 -0700
Quoted 5 lines
Small changes addressing races discovered by syzbot.
First patch is a cleanup.
Second patch moves a mutex init sooner.
Third patch makes sure each tfile gets its own napi enable flags.
Series applied and queued up for -stable.