From: Jason Xing <kerneljasonxing@gmail•com>
To: davem@davemloft•net, edumazet@google•com, kuba@kernel•org,
pabeni@redhat•com, dsahern@kernel•org, kuniyu@amazon•com
Cc: netdev@vger•kernel.org, kerneljasonxing@gmail•com,
Jason Xing <kernelxing@tencent•com>
Subject: [PATCH net-next v4 2/5] tcp: directly drop skb in cookie check for ipv4
Date: Tue, 13 Feb 2024 21:42:02 +0800 [thread overview]
Message-ID: <20240213134205.8705-3-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240213134205.8705-1-kerneljasonxing@gmail.com>
From: Jason Xing <kernelxing@tencent•com>
Only move the skb drop from tcp_v4_do_rcv() to cookie_v4_check() itself,
no other changes made. It can help us refine the specific drop reasons
later.
Signed-off-by: Jason Xing <kernelxing@tencent•com>
---
net/ipv4/syncookies.c | 4 ++++
net/ipv4/tcp_ipv4.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index be88bf586ff9..38f331da6677 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -408,6 +408,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)
struct rtable *rt;
__u8 rcv_wscale;
int full_space;
+ SKB_DR(reason);
if (!READ_ONCE(net->ipv4.sysctl_tcp_syncookies) ||
!th->ack || th->rst)
@@ -477,10 +478,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)
*/
if (ret)
inet_sk(ret)->cork.fl.u.ip4 = fl4;
+ else
+ goto out_drop;
out:
return ret;
out_free:
reqsk_free(req);
out_drop:
+ kfree_skb_reason(skb, reason);
return NULL;
}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 0c50c5a32b84..0a944e109088 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1915,7 +1915,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
struct sock *nsk = tcp_v4_cookie_check(sk, skb);
if (!nsk)
- goto discard;
+ return 0;
if (nsk != sk) {
if (tcp_child_process(sk, nsk, skb)) {
rsk = nsk;
--
2.37.3
next prev parent reply other threads:[~2024-02-13 13:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 13:42 [PATCH net-next v4 0/5] introduce drop reasons for cookie check Jason Xing
2024-02-13 13:42 ` [PATCH net-next v4 1/5] tcp: add dropreasons definitions and prepare " Jason Xing
2024-02-13 15:23 ` Eric Dumazet
2024-02-13 17:16 ` Jason Xing
2024-02-13 13:42 ` Jason Xing [this message]
2024-02-13 13:42 ` [PATCH net-next v4 3/5] tcp: use drop reasons in cookie check for ipv4 Jason Xing
2024-02-13 15:56 ` David Ahern
2024-02-13 17:01 ` Jason Xing
2024-02-13 13:42 ` [PATCH net-next v4 4/5] tcp: directly drop skb in cookie check for ipv6 Jason Xing
2024-02-13 15:30 ` Eric Dumazet
2024-02-13 17:09 ` Jason Xing
2024-02-13 13:42 ` [PATCH net-next v4 5/5] tcp: use drop reasons " Jason Xing
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=20240213134205.8705-3-kerneljasonxing@gmail.com \
--to=kerneljasonxing@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@kernel$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=kernelxing@tencent$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=kuniyu@amazon$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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