linux-kernel - [PATCH net-next 2/3] net: icmp: add skb drop reasons to ping_queue_rcv

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 14 Mar 2022 19:32:24 +0800
From:   menglong8.dong@...il.com
To:     dsahern@...nel.org, kuba@...nel.org
Cc:     davem@...emloft.net, rostedt@...dmis.org, mingo@...hat.com,
        yoshfuji@...ux-ipv6.org, imagedong@...cent.com,
        edumazet@...gle.com, kafai@...com, talalahmad@...gle.com,
        keescook@...omium.org, alobakin@...me, dongli.zhang@...cle.com,
        pabeni@...hat.com, maze@...gle.com, aahringo@...hat.com,
        weiwan@...gle.com, yangbo.lu@....com, fw@...len.de,
        tglx@...utronix.de, rpalethorpe@...e.com,
        linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: [PATCH net-next 2/3] net: icmp: add skb drop reasons to ping_queue_rcv_skb()

From: Menglong Dong <imagedong@...cent.com>

In order to get the reasons of skb drops, replace sock_queue_rcv_skb()
used in ping_queue_rcv_skb() with sock_queue_rcv_skb_reason().
Meanwhile, use kfree_skb_reason() instead of kfree_skb().

As we can see in ping_rcv(), 'skb' will be freed if '-1' is returned
by ping_queue_rcv_skb(). In order to get the drop reason of 'skb',
make ping_queue_rcv_skb() return the drop reason.

As ping_queue_rcv_skb() is used as 'ping_prot.backlog_rcv()', we can't
change its return type. (Seems ping_prot.backlog_rcv() is not used?)
Therefore, make it return 'drop_reason * -1' to keep the origin logic.

Signed-off-by: Menglong Dong <imagedong@...cent.com>
---
 net/ipv4/ping.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 3ee947557b88..cd4eb211431a 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -936,12 +936,13 @@ EXPORT_SYMBOL_GPL(ping_recvmsg);
 
 int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
+	enum skb_drop_reason reason;
 	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(sk, skb) < 0) {
-		kfree_skb(skb);
+	if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) {
+		kfree_skb_reason(skb, reason);
 		pr_debug("ping_queue_rcv_skb -> failed\n");
-		return -1;
+		return -reason;
 	}
 	return 0;
 }
-- 
2.35.1