netdev - Re: [Patch net v2] ipv4: fix a potential deadlock in mcast getsockopt() path

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] [day] [month] [year] [list]

Date:	Wed, 04 Nov 2015 21:30:51 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	xiyou.wangcong@...il.com
Cc:	netdev@...r.kernel.org, sasha.levin@...cle.com,
	marcelo.leitner@...il.com
Subject: Re: [Patch net v2] ipv4: fix a potential deadlock in mcast
 getsockopt() path

From: Cong Wang <xiyou.wangcong@...il.com>
Date: Tue,  3 Nov 2015 15:41:16 -0800

> Sasha reported the following lockdep warning:
> 
>   Possible unsafe locking scenario:
> 
>         CPU0                    CPU1
>         ----                    ----
>    lock(sk_lock-AF_INET);
>                                 lock(rtnl_mutex);
>                                 lock(sk_lock-AF_INET);
>    lock(rtnl_mutex);
> 
> This is due to that for IP_MSFILTER and MCAST_MSFILTER, we take
> rtnl lock before the socket lock in setsockopt() path, but take
> the socket lock before rtnl lock in getsockopt() path. All the
> rest optnames are setsockopt()-only.
> 
> Fix this by aligning the getsockopt() path with the setsockopt()
> path, so that all mcast socket path would be locked in the same
> order.
> 
> Note, IPv6 part is different where rtnl lock is not held.
> 
> Fixes: 54ff9ef36bdf ("ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}")
> Reported-by: Sasha Levin <sasha.levin@...cle.com>
> Cc: Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@...il.com>

I don't like conditional locking, but I can't think of a better
way to suggest fixing this, so applied.

And queued up for -stable as well.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html