Commit 909172a1 authored by Mao Wenan's avatar Mao Wenan Committed by Jakub Kicinski
Browse files

net: Update window_clamp if SOCK_RCVBUF is set 



When net.ipv4.tcp_syncookies=1 and syn flood is happened,
cookie_v4_check or cookie_v6_check tries to redo what
tcp_v4_send_synack or tcp_v6_send_synack did,
rsk_window_clamp will be changed if SOCK_RCVBUF is set,
which will make rcv_wscale is different, the client
still operates with initial window scale and can overshot
granted window, the client use the initial scale but local
server use new scale to advertise window value, and session
work abnormally.

Fixes: e88c64f0 ("tcp: allow effective reduction of TCP's rcv-buffer via setsockopt")
Signed-off-by: default avatarMao Wenan <wenan.mao@linux.alibaba.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/1604967391-123737-1-git-send-email-wenan.mao@linux.alibaba.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f3037c5a

net/ipv4/syncookies.c

+7 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	__u32 cookie = ntohl(th->ack_seq) - 1;

	struct sock *ret = sk;

	struct request_sock *req;

	int mss;

	int full_space, mss;

	struct rtable *rt;

	__u8 rcv_wscale;

	struct flowi4 fl4;
@@ -427,8 +427,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 


	/* Try to redo what tcp_v4_send_synack did. */

	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);

	/* limit the window selection if the user enforce a smaller rx buffer */

	full_space = tcp_full_space(sk);

	if (sk->sk_userlocks & SOCK_RCVBUF_LOCK &&

	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))

		req->rsk_window_clamp = full_space;



	tcp_select_initial_window(sk, tcp_full_space(sk), req->mss,

	tcp_select_initial_window(sk, full_space, req->mss,

				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,

				  ireq->wscale_ok, &rcv_wscale,

				  dst_metric(&rt->dst, RTAX_INITRWND));

net/ipv6/syncookies.c

+8 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) 
	__u32 cookie = ntohl(th->ack_seq) - 1;

	struct sock *ret = sk;

	struct request_sock *req;

	int mss;

	int full_space, mss;

	struct dst_entry *dst;

	__u8 rcv_wscale;

	u32 tsoff = 0;
@@ -241,7 +241,13 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) 
	}



	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);

	tcp_select_initial_window(sk, tcp_full_space(sk), req->mss,

	/* limit the window selection if the user enforce a smaller rx buffer */

	full_space = tcp_full_space(sk);

	if (sk->sk_userlocks & SOCK_RCVBUF_LOCK &&

	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))

		req->rsk_window_clamp = full_space;



	tcp_select_initial_window(sk, full_space, req->mss,

				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,

				  ireq->wscale_ok, &rcv_wscale,

				  dst_metric(dst, RTAX_INITRWND));