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

Commit 239fb791 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

vxlan: Correctly set flow*i_mark and flow4i_proto in route lookups 



VXLAN must provide the skb mark and specifiy IPPROTO_UDP when doing
the FIB lookup for the remote ip. Otherwise an invalid route might
be returned.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0d081c5

drivers/net/vxlan.c

+3 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		memset(&fl4, 0, sizeof(fl4));

		fl4.flowi4_oif = rdst->remote_ifindex;

		fl4.flowi4_tos = RT_TOS(tos);

		fl4.flowi4_mark = skb->mark;

		fl4.flowi4_proto = IPPROTO_UDP;

		fl4.daddr = dst->sin.sin_addr.s_addr;

		fl4.saddr = vxlan->saddr.sin.sin_addr.s_addr;
@@ -1981,6 +1983,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		fl6.flowi6_oif = rdst->remote_ifindex;

		fl6.daddr = dst->sin6.sin6_addr;

		fl6.saddr = vxlan->saddr.sin6.sin6_addr;

		fl6.flowi6_mark = skb->mark;

		fl6.flowi6_proto = IPPROTO_UDP;



		if (ipv6_stub->ipv6_dst_lookup(sk, &ndst, &fl6)) {