shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

geneve: lock RCU on TX path

Browse Source 
[ Upstream commit a717e3f740 ]

There is no guarantees that callers of the TX path will hold
the RCU lock.  Grab it explicitly.

Fixes: fceb9c3e38 ("geneve: avoid using stale geneve socket.")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jakub Kicinski
2017-02-24 11:43:37 -08:00
committed by Greg Kroah-Hartman
parent 0a40da4a74
commit 02595f4725
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/geneve.c
View File

@@ -1039,16 +1039,22 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct geneve_dev *geneve = netdev_priv(dev); struct geneve_dev *geneve = netdev_priv(dev);
struct ip_tunnel_info *info = NULL; struct ip_tunnel_info *info = NULL;
int err;
if (geneve->collect_md) if (geneve->collect_md)
info = skb_tunnel_info(skb); info = skb_tunnel_info(skb);
rcu_read_lock();
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
if ((info && ip_tunnel_info_af(info) == AF_INET6) || if ((info && ip_tunnel_info_af(info) == AF_INET6) ||
(!info && geneve->remote.sa.sa_family == AF_INET6)) (!info && geneve->remote.sa.sa_family == AF_INET6))
return geneve6_xmit_skb(skb, dev, info); err = geneve6_xmit_skb(skb, dev, info);
else
#endif #endif
return geneve_xmit_skb(skb, dev, info); err = geneve_xmit_skb(skb, dev, info);
rcu_read_unlock();
return err;
} }
static int __geneve_change_mtu(struct net_device *dev, int new_mtu, bool strict) static int __geneve_change_mtu(struct net_device *dev, int new_mtu, bool strict)