Commit 2f52bdcf authored by David Ahern's avatar David Ahern Committed by David S. Miller

net: Updates to netif_index_is_vrf

As Eric noted netif_index_is_vrf is not called with rcu_read_lock held,
so wrap the dev_get_by_index_rcu in rcu_read_lock and unlock.

If VRF is not enabled or oif is 0 skip the device lookup. In both cases
index cannot be the VRF master.
Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cd3778c
...@@ -3822,12 +3822,22 @@ static inline bool netif_is_vrf(const struct net_device *dev) ...@@ -3822,12 +3822,22 @@ static inline bool netif_is_vrf(const struct net_device *dev)
static inline bool netif_index_is_vrf(struct net *net, int ifindex) static inline bool netif_index_is_vrf(struct net *net, int ifindex)
{ {
struct net_device *dev = dev_get_by_index_rcu(net, ifindex);
bool rc = false; bool rc = false;
#if IS_ENABLED(CONFIG_NET_VRF)
struct net_device *dev;
if (ifindex == 0)
return false;
rcu_read_lock();
dev = dev_get_by_index_rcu(net, ifindex);
if (dev) if (dev)
rc = netif_is_vrf(dev); rc = netif_is_vrf(dev);
rcu_read_unlock();
#endif
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment