From: Mao Wenan <wenan.mao@linux.alibaba.com>
To: edumazet@google.com, davem@davemloft.net, kuznet@ms2.inr.ac.ru,
yoshfuji@linux-ipv6.org, kuba@kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Mao Wenan <wenan.mao@linux.alibaba.com>
Subject: [PATCH net v2] net: Update window_clamp if SOCK_RCVBUF is set
Date: Mon, 9 Nov 2020 17:33:37 +0800 [thread overview]
Message-ID: <1604914417-24578-1-git-send-email-wenan.mao@linux.alibaba.com> (raw)
In-Reply-To: <1604913614-19432-1-git-send-email-wenan.mao@linux.alibaba.com>
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.
Signed-off-by: Mao Wenan <wenan.mao@linux.alibaba.com>
---
v2: fix for ipv6.
net/ipv4/syncookies.c | 4 ++++
net/ipv6/syncookies.c | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 6ac473b..57ce317 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -427,6 +427,10 @@ 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 */
+ if (sk->sk_userlocks & SOCK_RCVBUF_LOCK &&
+ (req->rsk_window_clamp > tcp_full_space(sk) || req->rsk_window_clamp == 0))
+ req->rsk_window_clamp = tcp_full_space(sk);
tcp_select_initial_window(sk, tcp_full_space(sk), req->mss,
&req->rsk_rcv_wnd, &req->rsk_window_clamp,
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index e796a64..c041360 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -241,6 +241,11 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
}
req->rsk_window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
+ /* limit the window selection if the user enforce a smaller rx buffer */
+ if (sk->sk_userlocks & SOCK_RCVBUF_LOCK &&
+ (req->rsk_window_clamp > tcp_full_space(sk) || req->rsk_window_clamp == 0))
+ req->rsk_window_clamp = tcp_full_space(sk);
+
tcp_select_initial_window(sk, tcp_full_space(sk), req->mss,
&req->rsk_rcv_wnd, &req->rsk_window_clamp,
ireq->wscale_ok, &rcv_wscale,
--
1.8.3.1
next prev parent reply other threads:[~2020-11-09 9:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 9:20 [PATCH] net: Update window_clamp if SOCK_RCVBUF is set Mao Wenan
2020-11-09 9:33 ` Mao Wenan [this message]
2020-11-09 9:56 ` [PATCH net v2] " Eric Dumazet
2020-11-09 10:12 ` Mao Wenan
2020-11-09 10:19 ` Mao Wenan
2020-11-09 11:02 ` Eric Dumazet
2020-11-09 11:41 ` Eric Dumazet
2020-11-09 14:01 ` Eric Dumazet
2020-11-09 16:26 ` Mao Wenan
2020-11-09 16:53 ` [PATCH net v3] " Mao Wenan
2020-11-09 16:59 ` Eric Dumazet
2020-11-09 17:17 ` [PATCH net v4] " Mao Wenan
2020-11-09 17:28 ` Eric Dumazet
2020-11-10 0:16 ` [PATCH net v5] " Mao Wenan
2020-11-10 7:32 ` Eric Dumazet
2020-11-11 1:45 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1604914417-24578-1-git-send-email-wenan.mao@linux.alibaba.com \
--to=wenan.mao@linux.alibaba.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).