Commit 255f9034 authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

net: tcp: add skb drop reasons to tcp_v4_rcv() 



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

Reviewed-by: default avatarMengen Sun <mengensun@tencent.com>
Reviewed-by: default avatarHao Peng <flyingpeng@tencent.com>
Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 082116ff

net/ipv4/tcp_ipv4.c

+6 −1
Original line number Diff line number Diff line
@@ -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;
@@ -2166,6 +2170,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;

	}