From patchwork Sat Jan 11 09:50:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B411C33C9E for ; Sat, 11 Jan 2020 09:58:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02A352082E for ; Sat, 11 Jan 2020 09:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736689; bh=TcSIPZkTH4ZoWBKp9aOL7sVs7tTvgf3WAimogN6bRno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UpBdBC2qAE1It+sl5XPuCxrEibcEkUYlL3ZgwOhvP3aY+wn9nlorHM3cP0prtGGdh /t+zlH4aFfllUdPIiH4r5HP0cnsZhkru+Xxd+JBrXCL31Y+LBfUarJuU8vr/Z7HkhX krYvOQM1NppVQh0Oai+b8SL/al9UQW0Z+0uCto64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729198AbgAKJ6I (ORCPT ); Sat, 11 Jan 2020 04:58:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:51084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728825AbgAKJ6I (ORCPT ); Sat, 11 Jan 2020 04:58:08 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12EE92077C; Sat, 11 Jan 2020 09:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736687; bh=TcSIPZkTH4ZoWBKp9aOL7sVs7tTvgf3WAimogN6bRno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJF4AKX63TJms5M2UgV7KToaZKH/xNFomu4nKJnvmzV/ZVc7/WH17Xkn5v8yVTm9i 6iUODAuwhucarTYSui6e+PLlqPuQ3OqQSnrlYlMuZ6gu/8Ve0WsUthF5aQVO1X/l4A M1zFM3G9UiPu3zOcRRxif84/u5iX346v94hixReM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hangbin Liu , "David S. Miller" Subject: [PATCH 4.4 56/59] vxlan: fix tos value before xmit Date: Sat, 11 Jan 2020 10:50:05 +0100 Message-Id: <20200111094852.836466070@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094835.417654274@linuxfoundation.org> References: <20200111094835.417654274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hangbin Liu [ Upstream commit 71130f29979c7c7956b040673e6b9d5643003176 ] 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2068,7 +2068,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(rt, sk, skb, fl4.saddr, dst->sin.sin_addr.s_addr, tos, ttl, df,