linux-kernel - Re: [PATCH net-next] tuntap: fix possible deadlock when fail to register netdev

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1512702678.25033.20.camel@gmail.com>
Date:   Thu, 07 Dec 2017 19:11:18 -0800
From:   Eric Dumazet <eric.dumazet@...il.com>
To:     Jason Wang <jasowang@...hat.com>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Cc:     mst@...hat.com, Willem de Bruijn <willemb@...gle.com>
Subject: Re: [PATCH net-next] tuntap: fix possible deadlock when fail to
 register netdev

On Fri, 2017-12-08 at 10:54 +0800, Jason Wang wrote:
> Private destructor could be called when register_netdev() fail with
> rtnl lock held. This will lead deadlock in tun_free_netdev() who
> tries
> to hold rtnl_lock. Fixing this by switching to use spinlock to
> synchronize.
> 
> Fixes: 96f84061620c ("tun: add eBPF based queue selection method")
> Reported-by: Eric Dumazet <eric.dumazet@...il.com>
> Cc: Eric Dumazet <eric.dumazet@...il.com>
> Cc: Willem de Bruijn <willemb@...gle.com>
> Signed-off-by: Jason Wang <jasowang@...hat.com>
> ---
>  drivers/net/tun.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 787cc35..f7ccd79 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -2050,8 +2050,11 @@ static int __tun_set_steering_ebpf(struct
> tun_struct *tun,
>  		new->prog = prog;
>  	}
>  
> -	old = rtnl_dereference(tun->steering_prog);
> +	spin_lock(&tun->lock);
> +	old = rcu_dereference_protected(tun->steering_prog,
> +					lock_is_held(&tun->lock));
>  	rcu_assign_pointer(tun->steering_prog, new);
> +	spin_unlock(&tun->lock);
> 

Hi Jason, thank you for the following up.

Have you tested this code path with lockdep enabled ?

My gut feeling is that you need spin_lock_bh() here.

Thanks