[PATCH net-next v2] net: Updates to netif_index_is_vrf

[PATCH net-next v2] net: Updates to netif_index_is_vrf

[David Ahern]

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: David Ahern <dsa@cumulusnetworks.com>
---
v2:
- per Florian's suggestion keep the dev_get_by_index_rcu and wrap with
  rcu_read_lock/unlock versus moving to dev_get_by_index with dev_hold/put

 include/linux/netdevice.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f7a6ef2fae3a..2d3cd86c5618 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3819,12 +3819,22 @@ static inline bool netif_is_vrf(const struct net_device *dev)
 
 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;
 
+#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)
 		rc = netif_is_vrf(dev);
 
+	rcu_read_unlock();
+#endif
 	return rc;
 }
 
-- 
2.3.2 (Apple Git-55)

Re: [PATCH net-next v2] net: Updates to netif_index_is_vrf

[David Miller]

From: David Ahern <dsa@cumulusnetworks.com>
Date: Sun, 16 Aug 2015 07:49:20 -0600

> 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: David Ahern <dsa@cumulusnetworks.com>
> ---
> v2:
> - per Florian's suggestion keep the dev_get_by_index_rcu and wrap with
>   rcu_read_lock/unlock versus moving to dev_get_by_index with dev_hold/put

Applied, thanks.