Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56de859e authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

vxlan: lock RCU on TX path 



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

Fixes: c6fcc4fc ("vxlan: avoid using stale vxlan socket.")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39e6c820

drivers/net/vxlan.c

+6 −2
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	src_port = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,

				     vxlan->cfg.port_max, true);



	rcu_read_lock();

	if (dst->sa.sa_family == AF_INET) {

		struct vxlan_sock *sock4 = rcu_dereference(vxlan->vn4_sock);

		struct rtable *rt;
@@ -2127,7 +2128,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
						    dst_port, vni, &rt->dst,

						    rt->rt_flags);

			if (err)

				return;

				goto out_unlock;

		} else if (info->key.tun_flags & TUNNEL_DONT_FRAGMENT) {

			df = htons(IP_DF);

		}
@@ -2166,7 +2167,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
						    dst_port, vni, ndst,

						    rt6i_flags);

			if (err)

				return;

				goto out_unlock;

		}



		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
@@ -2183,6 +2184,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
				     label, src_port, dst_port, !udp_sum);

#endif

	}

out_unlock:

	rcu_read_unlock();

	return;



drop:
@@ -2191,6 +2194,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	return;



tx_error:

	rcu_read_unlock();

	if (err == -ELOOP)

		dev->stats.collisions++;

	else if (err == -ENETUNREACH)