Commit 02db5571 authored Dec 10, 2017 by Eric Dumazet Committed by David S. Miller Dec 12, 2017

tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()



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: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Wei Wang <weiwan@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c360f2b5

net/ipv4/tcp_input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -631,7 +631,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
		sk->sk_rcvbuf = rcvbuf;

		/* Make the window clamp follow along. */
		tp->window_clamp = rcvwin;
		tp->window_clamp = tcp_win_from_space(sk, rcvbuf);
		}
		}
		tp->rcvq_space.space = copied;