Commit 121622db authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

ipv6: route: make rtm_getroute not assume rtnl is locked 



__dev_get_by_index assumes RTNL is held, use _rcu version instead.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cc76595

net/ipv6/route.c

+6 −1
Original line number Diff line number Diff line
@@ -3611,8 +3611,11 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, 
		struct net_device *dev;

		int flags = 0;



		dev = __dev_get_by_index(net, iif);

		rcu_read_lock();



		dev = dev_get_by_index_rcu(net, iif);

		if (!dev) {

			rcu_read_unlock();

			err = -ENODEV;

			goto errout;

		}
@@ -3624,6 +3627,8 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, 


		if (!fibmatch)

			dst = ip6_route_input_lookup(net, dev, &fl6, flags);



		rcu_read_unlock();

	} else {

		fl6.flowi6_oif = oif;