From patchwork Fri Aug 5 19:19:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12937664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63985C25B07 for ; Fri, 5 Aug 2022 19:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241303AbiHETYP (ORCPT ); Fri, 5 Aug 2022 15:24:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241403AbiHETYH (ORCPT ); Fri, 5 Aug 2022 15:24:07 -0400 Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBE6E6C118; Fri, 5 Aug 2022 12:24:05 -0700 (PDT) Received: from pps.filterd (m0214197.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 275Iw8pG020710; Fri, 5 Aug 2022 21:20:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=NUqbJUEx5UEXY6K354sFjqPsxJuZMGKzADVaOWSqG+w=; b=4mlBd9c7zprNCj1pdF4xxLSa1XoT+DD3nlZ7If0G6naAVumv/PUr++kGu8lMYj2myyTX VSBDwp/buPCtEJ+v9f4ISPNR5Cpf/nFe0V+2F/SZsxfFzmX5Ck0AukhGrhNnUT+ZRtSt qCZX+hMZkOWq18cf7Ug3cGwu4Idz9tm93kgyBmw5p6TZMOVU5Mbh2QFeJ1+y2qvnz+xl vkuOPokfb2dVYfuUbE14VEE/MWjIJrRoWn/ednf/s4sMAiolhgMfy5yd1l4yTV+BAs6H 8DkVL5rFPO/gd0ISEbLfOYlIf/4svwDRPzGAZI34dsjWN/oWeUfzi4i4IIasKHLXO6Pe rg== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hr3tdsntq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 05 Aug 2022 21:20:21 +0200 Received: from Orpheus.nch.westermo.com (172.29.100.2) by EX01GLOBAL.beijerelectronics.com (10.101.10.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.2375.17; Fri, 5 Aug 2022 21:20:18 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH v3 net 4/4] ipv6: do not use RT_TOS for IPv6 flowlabel Date: Fri, 5 Aug 2022 21:19:06 +0200 Message-ID: <20220805191906.9323-5-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805191906.9323-1-matthias.may@westermo.com> References: <20220805191906.9323-1-matthias.may@westermo.com> MIME-Version: 1.0 X-Originating-IP: [172.29.100.2] X-ClientProxiedBy: wsevst-s0023.westermo.com (192.168.130.120) To EX01GLOBAL.beijerelectronics.com (10.101.10.25) X-Proofpoint-GUID: U0umUy_MebB7pvhyoL7Q9LZEirAB7eaC X-Proofpoint-ORIG-GUID: U0umUy_MebB7pvhyoL7Q9LZEirAB7eaC Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Quote: RT_TOS() is an old macro used to interprete IPv4 TOS as described in the obsolete RFC 1349. It's conceptually wrong to use it even in IPv4 code, although, given the current state of the code, most of the existing calls have no consequence. But using RT_TOS() in IPv6 code is always a bug: IPv6 never had a "TOS" field to be interpreted the RFC 1349 way. There's no historical compatibility to worry about. Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") Acked-by: Guillaume Nault Signed-off-by: Matthias May --- v1 -> v2: - Fix spacing of "Fixes" tag. - Add missing CCs v2 -> v3: - Add the info from the cover to the actual patch message (Guillaume Nault) --- net/ipv6/ip6_output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 77e3f5970ce4..ec62f472aa1c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1311,8 +1311,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb, fl6.daddr = info->key.u.ipv6.dst; fl6.saddr = info->key.u.ipv6.src; prio = info->key.tos; - fl6.flowlabel = ip6_make_flowinfo(RT_TOS(prio), - info->key.label); + fl6.flowlabel = ip6_make_flowinfo(prio, info->key.label); dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6, NULL);