| Message ID | 1431728699-7767-1-git-send-email-florent.fourcot@enst-bretagne.fr |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 2015-05-16 at 00:24 +0200, Florent Fourcot wrote: > commit 1d13a96c74fc ("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: 1d13a96c74fc ("ipv6: tcp: fix flowlabel value in ACK messages") > Reported-by: Eric Dumazet <eric.dumazet@gmail.com> > Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr> > --- Acked-by: Eric Dumazet <edumazet@google.com> Merci Florent ! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Florent Fourcot <florent.fourcot@enst-bretagne.fr> Date: Sat, 16 May 2015 00:24:59 +0200 > commit 1d13a96c74fc ("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: 1d13a96c74fc ("ipv6: tcp: fix flowlabel value in ACK messages") > Reported-by: Eric Dumazet <eric.dumazet@gmail.com> > Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index ebe2ab2..d322e84 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -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 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b6575d6..3adffb3 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -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); }
commit 1d13a96c74fc ("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: 1d13a96c74fc ("ipv6: tcp: fix flowlabel value in ACK messages") Reported-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr> --- net/ipv4/tcp_minisocks.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)