| From: Hangbin Liu <liuhangbin@gmail.com> |
| Date: Thu, 2 Jan 2020 17:23:45 +0800 |
| Subject: vxlan: fix tos value before xmit |
| |
| commit 71130f29979c7c7956b040673e6b9d5643003176 upstream. |
| |
| Before ip_tunnel_ecn_encap() and udp_tunnel_xmit_skb() we should filter |
| tos value by RT_TOS() instead of using config tos directly. |
| |
| vxlan_get_route() would filter the tos to fl4.flowi4_tos but we didn't |
| return it back, as geneve_get_v4_rt() did. So we have to use RT_TOS() |
| directly in function ip_tunnel_ecn_encap(). |
| |
| Fixes: 206aaafcd279 ("VXLAN: Use IP Tunnels tunnel ENC encap API") |
| Fixes: 1400615d64cf ("vxlan: allow setting ipv6 traffic class") |
| Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/vxlan.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/vxlan.c |
| +++ b/drivers/net/vxlan.c |
| @@ -1904,7 +1904,7 @@ static void vxlan_xmit_one(struct sk_buf |
| return; |
| } |
| |
| - tos = ip_tunnel_ecn_encap(tos, old_iph, skb); |
| + tos = ip_tunnel_ecn_encap(RT_TOS(tos), old_iph, skb); |
| ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); |
| |
| err = vxlan_xmit_skb(vxlan->vn_sock, rt, skb, |
