]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ipv6: do not use RT_TOS for IPv6 flowlabel
authorMatthias May <matthias.may@westermo.com>
Fri, 5 Aug 2022 19:19:06 +0000 (21:19 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 10 Aug 2022 05:19:21 +0000 (22:19 -0700)
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: 36553515916a ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.")
Acked-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Matthias May <matthias.may@westermo.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/ip6_output.c

index 897ca4f9b791f25dc05026e6535e5d3cab2507a4..f152e51242cb6e11f33ab69150e44cd079f8e3af 100644 (file)
@@ -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);