Skip to content

Commit e010ae0

Browse files
Guillaume Naultkuba-moo
authored andcommitted
ipv6: Fix datagram socket connection with DSCP.
Take into account the IPV6_TCLASS socket option (DSCP) in ip6_datagram_flow_key_init(). Otherwise fib6_rule_match() can't properly match the DSCP value, resulting in invalid route lookup. For example: ip route add unreachable table main 2001:db8::10/124 ip route add table 100 2001:db8::10/124 dev eth0 ip -6 rule add dsfield 0x04 table 100 echo test | socat - UDP6:[2001:db8::11]:54321,ipv6-tclass=0x04 Without this patch, socat fails at connect() time ("No route to host") because the fib-rule doesn't jump to table 100 and the lookup ends up being done in the main table. Fixes: 2cc67cc ("[IPV6] ROUTE: Routing by Traffic Class.") Signed-off-by: Guillaume Nault <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Reviewed-by: David Ahern <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6e16e67 commit e010ae0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/ipv6/datagram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void ip6_datagram_flow_key_init(struct flowi6 *fl6, struct sock *sk)
5151
fl6->flowi6_mark = sk->sk_mark;
5252
fl6->fl6_dport = inet->inet_dport;
5353
fl6->fl6_sport = inet->inet_sport;
54-
fl6->flowlabel = np->flow_label;
54+
fl6->flowlabel = ip6_make_flowinfo(np->tclass, np->flow_label);
5555
fl6->flowi6_uid = sk->sk_uid;
5656

5757
if (!oif)

0 commit comments

Comments
 (0)