]> git.baikalelectronics.ru Git - kernel.git/commit
tcp: consider recv buf for the initial window scale
authorSoheil Hassas Yeganeh <soheil@google.com>
Fri, 29 Jul 2016 13:34:02 +0000 (09:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 31 Jul 2016 04:21:57 +0000 (21:21 -0700)
commit6445871413da2f00834ce218368634698b3eb501
tree032f554f8c42e31904c8c11856945c70244441cb
parent0599b6eebcaf6e9034fc4997b23c96fe2b37e8aa
tcp: consider recv buf for the initial window scale

tcp_select_initial_window() intends to advertise a window
scaling for the maximum possible window size. To do so,
it considers the maximum of net.ipv4.tcp_rmem[2] and
net.core.rmem_max as the only possible upper-bounds.
However, users with CAP_NET_ADMIN can use SO_RCVBUFFORCE
to set the socket's receive buffer size to values
larger than net.ipv4.tcp_rmem[2] and net.core.rmem_max.
Thus, SO_RCVBUFFORCE is effectively ignored by
tcp_select_initial_window().

To fix this, consider the maximum of net.ipv4.tcp_rmem[2],
net.core.rmem_max and socket's initial buffer space.

Fixes: 91acdab3ea9a ("[NET]: Introduce SO_{SND,RCV}BUFFORCE socket options")
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Suggested-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_output.c