Commit a606a497 authored by Eric Dumazet's avatar Eric Dumazet Committed by Stefan Bader

tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()

BugLink: https://bugs.launchpad.net/bugs/1784382

commit 02db5571 upstream.

While rcvbuf is properly clamped by tcp_rmem[2], rcvwin
is left to a potentially too big value.

It has no serious effect, since :
1) tcp_grow_window() has very strict checks.
2) window_clamp can be mangled by user space to any value anyway.

tcp_init_buffer_space() and companions use tcp_full_space(),
we use tcp_win_from_space() to avoid reloading sk->sk_rcvbuf
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 0396e195
...@@ -612,7 +612,7 @@ void tcp_rcv_space_adjust(struct sock *sk) ...@@ -612,7 +612,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
sk->sk_rcvbuf = rcvbuf; sk->sk_rcvbuf = rcvbuf;
/* Make the window clamp follow along. */ /* Make the window clamp follow along. */
tp->window_clamp = rcvwin; tp->window_clamp = tcp_win_from_space(rcvbuf);
} }
} }
tp->rcvq_space.space = copied; tp->rcvq_space.space = copied;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment