[Devel] [PATCH 11/47] net: tcp: use kfree_skb_reason() for tcp_v6_rcv()

[Nikolay Borisov]

From: Menglong Dong <imaged...@tencent.com>

Replace kfree_skb() used in tcp_v6_rcv() with kfree_skb_reason().

Reviewed-by: Mengen Sun <mengen...@tencent.com>
Reviewed-by: Hao Peng <flyingp...@tencent.com>
Signed-off-by: Menglong Dong <imaged...@tencent.com>
Reviewed-by: Eric Dumazet <eduma...@google.com>
Reviewed-by: David Ahern <dsah...@kernel.org>
Signed-off-by: David S. Miller <da...@davemloft.net>
Acked-by: Nikolay Borisov <nbori...@suse.com>
Signed-off-by: Nikolay Borisov <nikolay.bori...@virtuozzo.com>
---
 net/ipv6/tcp_ipv6.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 8053eadaf0af..19e7b2a400ae 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1621,6 +1621,7 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const 
struct ipv6hdr *hdr,
 
 INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
 {
+       enum skb_drop_reason drop_reason;
        int sdif = inet6_sdif(skb);
        int dif = inet6_iif(skb);
        const struct tcphdr *th;
@@ -1643,8 +1644,10 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
 
        th = (const struct tcphdr *)skb->data;
 
-       if (unlikely(th->doff < sizeof(struct tcphdr)/4))
+       if (unlikely(th->doff < sizeof(struct tcphdr)/4)) {
+               drop_reason = SKB_DROP_REASON_PKT_TOO_SMALL;
                goto bad_packet;
+       }
        if (!pskb_may_pull(skb, th->doff*4))
                goto discard_it;
 
@@ -1700,6 +1703,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
                        hdr = ipv6_hdr(skb);
                        tcp_v6_fill_cb(skb, hdr, th);
                        nsk = tcp_check_req(sk, skb, req, false, &req_stolen);
+               } else {
+                       drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
                }
                if (!nsk) {
                        reqsk_put(req);
@@ -1731,14 +1736,18 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
                goto discard_and_relse;
        }
 
-       if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
+       if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
+               drop_reason = SKB_DROP_REASON_XFRM_POLICY;
                goto discard_and_relse;
+       }
 
        if (tcp_v6_inbound_md5_hash(sk, skb, dif, sdif))
                goto discard_and_relse;
 
-       if (tcp_filter(sk, skb))
+       if (tcp_filter(sk, skb)) {
+               drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
                goto discard_and_relse;
+       }
        th = (const struct tcphdr *)skb->data;
        hdr = ipv6_hdr(skb);
        tcp_v6_fill_cb(skb, hdr, th);
@@ -1768,6 +1777,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
        return ret ? -1 : 0;
 
 no_tcp_socket:
+       drop_reason = SKB_DROP_REASON_NO_SOCKET;
        if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
                goto discard_it;
 
@@ -1775,6 +1785,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
 
        if (tcp_checksum_complete(skb)) {
 csum_error:
+               drop_reason = SKB_DROP_REASON_TCP_CSUM;
                trace_tcp_bad_csum(skb);
                __TCP_INC_STATS(net, TCP_MIB_CSUMERRORS);
 bad_packet:
@@ -1784,7 +1795,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
        }
 
 discard_it:
-       kfree_skb(skb);
+       kfree_skb_reason(skb, drop_reason);
        return 0;
 
 discard_and_relse:
@@ -1795,6 +1806,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff 
*skb)
 
 do_time_wait:
        if (!xfrm6_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

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel