Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21858cd0 authored by Florent Fourcot's avatar Florent Fourcot Committed by David S. Miller
Browse files

tcp/ipv6: fix flow label setting in TIME_WAIT state 



commit 1d13a96c ("ipv6: tcp: fix flowlabel value in ACK messages
send from TIME_WAIT") added the flow label in the last TCP packets.
Unfortunately, it was not casted properly.

This patch replace the buggy shift with be32_to_cpu/cpu_to_be32.

Fixes: 1d13a96c ("ipv6: tcp: fix flowlabel value in ACK messages")
Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed2a80ab

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) 
			tw->tw_v6_daddr = sk->sk_v6_daddr;

			tw->tw_v6_rcv_saddr = sk->sk_v6_rcv_saddr;

			tw->tw_tclass = np->tclass;

			tw->tw_flowlabel = np->flow_label >> 12;

			tw->tw_flowlabel = be32_to_cpu(np->flow_label & IPV6_FLOWLABEL_MASK);

			tw->tw_ipv6only = sk->sk_ipv6only;

		}

#endif

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb) 
			tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,

			tcp_time_stamp + tcptw->tw_ts_offset,

			tcptw->tw_ts_recent, tw->tw_bound_dev_if, tcp_twsk_md5_key(tcptw),

			tw->tw_tclass, (tw->tw_flowlabel << 12));

			tw->tw_tclass, cpu_to_be32(tw->tw_flowlabel));



	inet_twsk_put(tw);

}