From nobody Mon Feb 9 13:29:23 2026 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA3003C30; Tue, 27 May 2025 10:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.216.63.40 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748343471; cv=none; b=aUON1yXzUlfefhdJJeGlLMEVb9n3T3YtPwSAyRABQ/E4JVQrPDSDilvhtNLOj/tv/y1ju81f7NOJCi1X084TkSdk+qSyjvJ7nnMIofAyZltlDpPIZysr7fWMSw6oztf2l2l5LQlXw37mu9+ZPQ9l24i8WbNqObgHILmXYQl8vmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748343471; c=relaxed/simple; bh=kn/nRRLMtAjxo7kfizv0Ybk8CZ92Ovm7QgzR/FkyBVw=; h=Date:Message-ID:Mime-Version:From:To:Cc:Subject:Content-Type; b=RbiVD5CLXGEUKImv05KA+gRAf6iTdwNwPf80PznBMI5R3dC5FoD+UPQq+xCZY3zaZb2ycQ/7cQeeEqIzKpA9ke2sjx1BlWIoycrQAVYOJpu50piw5ay+URZfI8HM42iULN6exEinjlIWhHWBUhJja7MB5zzWkExvJOvi13w02iY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn; spf=pass smtp.mailfrom=zte.com.cn; arc=none smtp.client-ip=63.216.63.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zte.com.cn Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4b68jc5V7Xz8R043; Tue, 27 May 2025 18:57:40 +0800 (CST) Received: from njb2app07.zte.com.cn ([10.55.22.95]) by mse-fl1.zte.com.cn with SMTP id 54RAvW65014815; Tue, 27 May 2025 18:57:32 +0800 (+08) (envelope-from jiang.kun2@zte.com.cn) Received: from mapi (njy2app04[null]) by mapi (Zmail) with MAPI id mid204; Tue, 27 May 2025 18:57:36 +0800 (CST) Date: Tue, 27 May 2025 18:57:36 +0800 (CST) X-Zmail-TransId: 2afc68359aa0ffffffffc7e-feb8f X-Mailer: Zmail v1.0 Message-ID: <20250527185736038u-6EtRPVin2ftxbrp-C4w@zte.com.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: Cc: , , , , , , , , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIG5ldC1uZXh0IHYyXSBuZXQ6IGFycDogdXNlIGtmcmVlX3NrYl9yZWFzb24oKSBpbiBhcnBfcmN2KCk=?= X-MAIL: mse-fl1.zte.com.cn 54RAvW65014815 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 68359AA4.002/4b68jc5V7Xz8R043 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Qiu Yutan Replace kfree_skb() with kfree_skb_reason() in arp_rcv(). Signed-off-by: Qiu Yutan Signed-off-by: Jiang Kun --- 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_devi= ce *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_de= vice *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 =3D pskb_may_pull_reason(skb, arp_hdr_len(dev)); + if (drop_reason !=3D SKB_NOT_DROPPED_YET) goto freeskb; arp =3D arp_hdr(skb); - if (arp->ar_hln !=3D dev->addr_len || arp->ar_pln !=3D 4) + if (arp->ar_hln !=3D dev->addr_len || arp->ar_pln !=3D 4) { + drop_reason =3D 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_dev= ice *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; } --=20 2.25.1