From: Yan Zhai <yan@cloudflare.com>
Date: Mon, 17 Jun 2024 18:09:13 +0000 (-0700)
Subject: ping: use sk_skb_reason_drop to free rx packets
X-Git-Tag: v6.11-rc1~163^2~180^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7467de17635fb9d240987a0b9574fb2283a53b73;p=thirdparty%2Fkernel%2Flinux.git

ping: use sk_skb_reason_drop to free rx packets

Replace kfree_skb_reason with sk_skb_reason_drop and pass the receiving
socket to the tracepoint.

Signed-off-by: Yan Zhai <yan@cloudflare.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 823306487a821..619ddc087957f 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -946,7 +946,7 @@ static enum skb_drop_reason __ping_queue_rcv_skb(struct sock *sk,
 	pr_debug("ping_queue_rcv_skb(sk=%p,sk->num=%d,skb=%p)\n",
 		 inet_sk(sk), inet_sk(sk)->inet_num, skb);
 	if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) {
-		kfree_skb_reason(skb, reason);
+		sk_skb_reason_drop(sk, skb, reason);
 		pr_debug("ping_queue_rcv_skb -> failed\n");
 		return reason;
 	}