Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4a6853d authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

ipv6: invert join/leave anycast rtnl/socket locking order 



Commit baf606d9 ("ipv4,ipv6: grab rtnl before locking the socket")
missed to update two setsockopt options, IPV6_JOIN_ANYCAST and
IPV6_LEAVE_ANYCAST, causing a lock inverstion regarding to the updated ones.

As ipv6_sock_ac_join and ipv6_sock_ac_leave are only called from
do_ipv6_setsockopt, we are good to just move the rtnl lock upper.

Fixes: baf606d9 ("ipv4,ipv6: grab rtnl before locking the socket")
Reported-by: default avatarYing Huang <ying.huang@intel.com>
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 149d7549

net/ipv6/anycast.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	int	ishost = !net->ipv6.devconf_all->forwarding;

	int	ishost = !net->ipv6.devconf_all->forwarding;

	int	err = 0;

	int	err = 0;





	ASSERT_RTNL();



	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;

	if (ipv6_addr_is_multicast(addr))

	if (ipv6_addr_is_multicast(addr))
@@ -73,7 +75,6 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	pac->acl_next = NULL;

	pac->acl_next = NULL;

	pac->acl_addr = *addr;

	pac->acl_addr = *addr;





	rtnl_lock();

	if (ifindex == 0) {

	if (ifindex == 0) {

		struct rt6_info *rt;

		struct rt6_info *rt;
@@ -130,7 +131,6 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	}

	}





error:

error:

	rtnl_unlock();

	if (pac)

	if (pac)

		sock_kfree_s(sk, pac, sizeof(*pac));

		sock_kfree_s(sk, pac, sizeof(*pac));

	return err;

	return err;
@@ -146,7 +146,8 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	struct ipv6_ac_socklist *pac, *prev_pac;

	struct ipv6_ac_socklist *pac, *prev_pac;

	struct net *net = sock_net(sk);

	struct net *net = sock_net(sk);





	rtnl_lock();

	ASSERT_RTNL();



	prev_pac = NULL;

	prev_pac = NULL;

	for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {

	for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {

		if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&

		if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&
@@ -154,10 +155,8 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
			break;

			break;

		prev_pac = pac;

		prev_pac = pac;

	}

	}

	if (!pac) {

	if (!pac)

		rtnl_unlock();

		return -ENOENT;

		return -ENOENT;

	}

	if (prev_pac)

	if (prev_pac)

		prev_pac->acl_next = pac->acl_next;

		prev_pac->acl_next = pac->acl_next;

	else

	else
@@ -166,7 +165,6 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	dev = __dev_get_by_index(net, pac->acl_ifindex);

	dev = __dev_get_by_index(net, pac->acl_ifindex);

	if (dev)

	if (dev)

		ipv6_dev_ac_dec(dev, &pac->acl_addr);

		ipv6_dev_ac_dec(dev, &pac->acl_addr);

	rtnl_unlock();





	sock_kfree_s(sk, pac, sizeof(*pac));

	sock_kfree_s(sk, pac, sizeof(*pac));

	return 0;

	return 0;

net/ipv6/ipv6_sockglue.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,8 @@ static bool setsockopt_needs_rtnl(int optname) 
	switch (optname) {

	switch (optname) {

	case IPV6_ADD_MEMBERSHIP:

	case IPV6_ADD_MEMBERSHIP:

	case IPV6_DROP_MEMBERSHIP:

	case IPV6_DROP_MEMBERSHIP:

	case IPV6_JOIN_ANYCAST:

	case IPV6_LEAVE_ANYCAST:

	case MCAST_JOIN_GROUP:

	case MCAST_JOIN_GROUP:

	case MCAST_LEAVE_GROUP:

	case MCAST_LEAVE_GROUP:

	case MCAST_JOIN_SOURCE_GROUP:

	case MCAST_JOIN_SOURCE_GROUP: