Skip to contentSkip to conversation

Patch "geneve: lock RCU on TX path" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Mar 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

geneve: lock RCU on TX path

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
geneve-lock-rcu-on-tx-path.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Mar 18 22:03:25 CST 2017

From: Jakub Kicinski <[email protected]>
Date: Fri, 24 Feb 2017 11:43:37 -0800
Subject: geneve: lock RCU on TX path

From: Jakub Kicinski <[email protected]>

[ Upstream commit a717e3f740803cc88bd5c9a70c93504f6a368663 ]

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

Fixes fceb9c3e3825 ("geneve: avoid using stale geneve socket.")
---
 drivers/net/geneve.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/geneve.c +8 -2
@@ -1039,16 +1039,22 @@ static netdev_tx_t geneve_xmit(struct sk
 {
 	struct geneve_dev *geneve = netdev_priv(dev);
 	struct ip_tunnel_info *info = NULL;
+	int err;
 
 	if (geneve->collect_md)
 		info = skb_tunnel_info(skb);
 
+	rcu_read_lock();
 #if IS_ENABLED(CONFIG_IPV6)
 	if ((info && ip_tunnel_info_af(info) == 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
-	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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/vxlan-lock-rcu-on-tx-path.patch
queue-4.9/geneve-lock-rcu-on-tx-path.patch