]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ipv6: fix rtnl locking in setsockopt for anycast and multicast
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 2 Sep 2014 08:29:29 +0000 (10:29 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Sep 2014 18:52:28 +0000 (11:52 -0700)
commita9ed4a2986e13011fcf4ed2d1a1647c53112f55b
tree508293e1b03b96cfdfd05e57ddd8dc60c0157b1d
parent4ad9a64f53c619969dede1143d56ccda1a453c39
ipv6: fix rtnl locking in setsockopt for anycast and multicast

Calling setsockopt with IPV6_JOIN_ANYCAST or IPV6_LEAVE_ANYCAST
triggers the assertion in addrconf_join_solict()/addrconf_leave_solict()

ipv6_sock_ac_join(), ipv6_sock_ac_drop(), ipv6_sock_ac_close() need to
take RTNL before calling ipv6_dev_ac_inc/dec. Same thing with
ipv6_sock_mc_join(), ipv6_sock_mc_drop(), ipv6_sock_mc_close() before
calling ipv6_dev_mc_inc/dec.

This patch moves ASSERT_RTNL() up a level in the call stack.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reported-by: Tommi Rantala <tt.rantala@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/addrconf.c
net/ipv6/anycast.c
net/ipv6/mcast.c