[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250527185736038u-6EtRPVin2ftxbrp-C4w@zte.com.cn>
Date: Tue, 27 May 2025 18:57:36 +0800 (CST)
From: <jiang.kun2@....com.cn>
To: <edumazet@...gle.com>
Cc: <davem@...emloft.net>, <kuba@...nel.org>, <dsahern@...nel.org>,
<pabeni@...hat.com>, <horms@...nel.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <xu.xin16@....com.cn>,
<yang.yang29@....com.cn>, <wang.yaxin@....com.cn>,
<fan.yu9@....com.cn>, <he.peilin@....com.cn>, <tu.qiang35@....com.cn>,
<qiu.yutan@....com.cn>, <zhang.yunkai@....com.cn>,
<ye.xingchen@....com.cn>
Subject: [PATCH net-next v2] net: arp: use kfree_skb_reason() in arp_rcv()
From: Qiu Yutan <qiu.yutan@....com.cn>
Replace kfree_skb() with kfree_skb_reason() in arp_rcv().
Signed-off-by: Qiu Yutan <qiu.yutan@....com.cn>
Signed-off-by: Jiang Kun <jiang.kun2@....com.cn>
---
net/ipv4/arp.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index a648fff71ea7..5b4dac7bbde4 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -967,6 +967,7 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
const struct arphdr *arp;
+ enum skb_drop_reason drop_reason;
/* do not tweak dropwatch on an ARP we will ignore */
if (dev->flags & IFF_NOARP ||
@@ -979,12 +980,15 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
goto out_of_mem;
/* ARP header, plus 2 device addresses, plus 2 IP addresses. */
- if (!pskb_may_pull(skb, arp_hdr_len(dev)))
+ drop_reason = pskb_may_pull_reason(skb, arp_hdr_len(dev));
+ if (drop_reason != SKB_NOT_DROPPED_YET)
goto freeskb;
arp = arp_hdr(skb);
- if (arp->ar_hln != dev->addr_len || arp->ar_pln != 4)
+ if (arp->ar_hln != dev->addr_len || arp->ar_pln != 4) {
+ drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;
goto freeskb;
+ }
memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));
@@ -996,7 +1000,7 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
consume_skb(skb);
return NET_RX_SUCCESS;
freeskb:
- kfree_skb(skb);
+ kfree_skb_reason(skb, drop_reason);
out_of_mem:
return NET_RX_DROP;
}
--
2.25.1
Powered by blists - more mailing lists