From: menglong8.dong@gmail.com
To: dsahern@kernel.org, kuba@kernel.org
Cc: edumazet@google.com, davem@davemloft.net, rostedt@goodmis.org,
mingo@redhat.com, yoshfuji@linux-ipv6.org, ast@kernel.org,
daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com,
imagedong@tencent.com, talalahmad@google.com,
keescook@chromium.org, ilias.apalodimas@linaro.org,
alobakin@pm.me, memxor@gmail.com, atenart@kernel.org,
bigeasy@linutronix.de, pabeni@redhat.com, linyunsheng@huawei.com,
arnd@arndb.de, yajun.deng@linux.dev, roopa@nvidia.com,
willemb@google.com, vvs@virtuozzo.com, cong.wang@bytedance.com,
luiz.von.dentz@intel.com, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
flyingpeng@tencent.com
Subject: [PATCH net-next 2/9] net: tcp: add skb drop reasons to tcp_v4_rcv()
Date: Wed, 16 Feb 2022 11:54:19 +0800 [thread overview]
Message-ID: <20220216035426.2233808-3-imagedong@tencent.com> (raw)
In-Reply-To: <20220216035426.2233808-1-imagedong@tencent.com>
From: Menglong Dong <imagedong@tencent.com>
Use kfree_skb_reason() for some path in tcp_v4_rcv() that missed before,
including:
SKB_DROP_REASON_SOCKET_FILTER
SKB_DROP_REASON_XFRM_POLICY
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
net/ipv4/tcp_ipv4.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 6873f46fc8ba..a93921fb498f 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2057,6 +2057,8 @@ int tcp_v4_rcv(struct sk_buff *skb)
iph = ip_hdr(skb);
tcp_v4_fill_cb(skb, iph, th);
nsk = tcp_check_req(sk, skb, req, false, &req_stolen);
+ } else {
+ drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
}
if (!nsk) {
reqsk_put(req);
@@ -2092,8 +2094,10 @@ int tcp_v4_rcv(struct sk_buff *skb)
}
}
- if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
+ if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
+ drop_reason = SKB_DROP_REASON_XFRM_POLICY;
goto discard_and_relse;
+ }
if (tcp_v4_inbound_md5_hash(sk, skb, dif, sdif))
goto discard_and_relse;
@@ -2137,8 +2141,10 @@ int tcp_v4_rcv(struct sk_buff *skb)
no_tcp_socket:
drop_reason = SKB_DROP_REASON_NO_SOCKET;
- if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
+ if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
+ drop_reason = SKB_DROP_REASON_XFRM_POLICY;
goto discard_it;
+ }
tcp_v4_fill_cb(skb, iph, th);
@@ -2166,6 +2172,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
do_time_wait:
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
+ drop_reason = SKB_DROP_REASON_XFRM_POLICY;
inet_twsk_put(inet_twsk(sk));
goto discard_it;
}
--
2.34.1
next prev parent reply other threads:[~2022-02-16 3:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 3:54 [PATCH net-next 0/9] net: add skb drop reasons to TCP packet receive menglong8.dong
2022-02-16 3:54 ` [PATCH net-next 1/9] net: tcp: introduce tcp_drop_reason() menglong8.dong
2022-02-16 15:58 ` Jakub Kicinski
2022-02-16 16:50 ` Steven Rostedt
2022-02-18 2:28 ` Menglong Dong
2022-02-16 3:54 ` menglong8.dong [this message]
2022-02-17 4:06 ` [PATCH net-next 2/9] net: tcp: add skb drop reasons to tcp_v4_rcv() David Ahern
2022-02-16 3:54 ` [PATCH net-next 3/9] net: tcp: use kfree_skb_reason() for tcp_v6_rcv() menglong8.dong
2022-02-17 4:07 ` David Ahern
2022-02-16 3:54 ` [PATCH net-next 4/9] net: tcp: add skb drop reasons to tcp_v{4,6}_inbound_md5_hash() menglong8.dong
2022-02-16 3:54 ` [PATCH net-next 5/9] net: tcp: add skb drop reasons to tcp_add_backlog() menglong8.dong
2022-02-16 3:54 ` [PATCH net-next 6/9] net: tcp: use kfree_skb_reason() for tcp_v{4,6}_do_rcv() menglong8.dong
2022-02-16 15:55 ` Jakub Kicinski
2022-02-16 3:54 ` [PATCH net-next 7/9] net: tcp: use tcp_drop_reason() for tcp_rcv_established() menglong8.dong
2022-02-16 3:54 ` [PATCH net-next 8/9] net: tcp: use tcp_drop_reason() for tcp_data_queue() menglong8.dong
2022-02-16 3:54 ` [PATCH net-next 9/9] net: tcp: use tcp_drop_reason() for tcp_data_queue_ofo() menglong8.dong
2022-02-16 17:04 ` [PATCH net-next 0/9] net: add skb drop reasons to TCP packet receive Eric Dumazet
2022-02-18 2:42 ` Menglong Dong
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=20220216035426.2233808-3-imagedong@tencent.com \
--to=menglong8.dong@gmail.com \
--cc=alobakin@pm.me \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=atenart@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=flyingpeng@tencent.com \
--cc=hawk@kernel.org \
--cc=ilias.apalodimas@linaro.org \
--cc=imagedong@tencent.com \
--cc=john.fastabend@gmail.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linyunsheng@huawei.com \
--cc=luiz.von.dentz@intel.com \
--cc=memxor@gmail.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=roopa@nvidia.com \
--cc=rostedt@goodmis.org \
--cc=talalahmad@google.com \
--cc=vvs@virtuozzo.com \
--cc=willemb@google.com \
--cc=yajun.deng@linux.dev \
--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).