Commit 1379a92d authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

net: udp: use kfree_skb_reason() in udp_queue_rcv_one_skb() 



Replace kfree_skb() with kfree_skb_reason() in udp_queue_rcv_one_skb().

Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10580c47

net/ipv4/udp.c

+9 −3
Original line number Diff line number Diff line
@@ -2120,14 +2120,17 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
 */

static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)

{

	int drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;

	struct udp_sock *up = udp_sk(sk);

	int is_udplite = IS_UDPLITE(sk);



	/*

	 *	Charge it to the socket, dropping if the queue is full.

	 */

	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 drop;

	}

	nf_reset_ct(skb);



	if (static_branch_unlikely(&udp_encap_needed_key) && up->encap_type) {
@@ -2204,8 +2207,10 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb) 
	    udp_lib_checksum_complete(skb))

			goto csum_error;



	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr)))

	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr))) {

		drop_reason = SKB_DROP_REASON_SOCKET_FILTER;

		goto drop;

	}



	udp_csum_pull_header(skb);
@@ -2213,11 +2218,12 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb) 
	return __udp_queue_rcv_skb(sk, skb);



csum_error:

	drop_reason = SKB_DROP_REASON_UDP_CSUM;

	__UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);

drop:

	__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	atomic_inc(&sk->sk_drops);

	kfree_skb(skb);

	kfree_skb_reason(skb, drop_reason);

	return -1;

}