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

Commit 4ecb1d83 authored by Martynas Pumputis's avatar Martynas Pumputis Committed by David S. Miller
Browse files

vxlan: Set ports in flow key when doing route lookups 



Otherwise, a xfrm policy with sport/dport being set cannot be matched.

Signed-off-by: default avatarMartynas Pumputis <martynas@weave.works>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19c0f40d

drivers/net/vxlan.c

+10 −3
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst, 
static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device *dev,

				      struct vxlan_sock *sock4,

				      struct sk_buff *skb, int oif, u8 tos,

				      __be32 daddr, __be32 *saddr,

				      __be32 daddr, __be32 *saddr, __be16 dport, __be16 sport,

				      struct dst_cache *dst_cache,

				      const struct ip_tunnel_info *info)

{
@@ -1824,6 +1824,8 @@ static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device 
	fl4.flowi4_proto = IPPROTO_UDP;

	fl4.daddr = daddr;

	fl4.saddr = *saddr;

	fl4.fl4_dport = dport;

	fl4.fl4_sport = sport;



	rt = ip_route_output_key(vxlan->net, &fl4);

	if (likely(!IS_ERR(rt))) {
@@ -1851,6 +1853,7 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan, 
					  __be32 label,

					  const struct in6_addr *daddr,

					  struct in6_addr *saddr,

					  __be16 dport, __be16 sport,

					  struct dst_cache *dst_cache,

					  const struct ip_tunnel_info *info)

{
@@ -1877,6 +1880,8 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan, 
	fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label);

	fl6.flowi6_mark = skb->mark;

	fl6.flowi6_proto = IPPROTO_UDP;

	fl6.fl6_dport = dport;

	fl6.fl6_sport = sport;



	err = ipv6_stub->ipv6_dst_lookup(vxlan->net,

					 sock6->sock->sk,
@@ -2068,6 +2073,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
				     rdst ? rdst->remote_ifindex : 0, tos,

				     dst->sin.sin_addr.s_addr,

				     &src->sin.sin_addr.s_addr,

				     dst_port, src_port,

				     dst_cache, info);

		if (IS_ERR(rt)) {

			err = PTR_ERR(rt);
@@ -2104,6 +2110,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
					rdst ? rdst->remote_ifindex : 0, tos,

					label, &dst->sin6.sin6_addr,

					&src->sin6.sin6_addr,

					dst_port, src_port,

					dst_cache, info);

		if (IS_ERR(ndst)) {

			err = PTR_ERR(ndst);
@@ -2430,7 +2437,7 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) 


		rt = vxlan_get_route(vxlan, dev, sock4, skb, 0, info->key.tos,

				     info->key.u.ipv4.dst,

				     &info->key.u.ipv4.src, NULL, info);

				     &info->key.u.ipv4.src, dport, sport, NULL, info);

		if (IS_ERR(rt))

			return PTR_ERR(rt);

		ip_rt_put(rt);
@@ -2441,7 +2448,7 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) 


		ndst = vxlan6_get_route(vxlan, dev, sock6, skb, 0, info->key.tos,

					info->key.label, &info->key.u.ipv6.dst,

					&info->key.u.ipv6.src, NULL, info);

					&info->key.u.ipv6.src, dport, sport, NULL, info);

		if (IS_ERR(ndst))

			return PTR_ERR(ndst);

		dst_release(ndst);