From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CBA86D30B; Tue, 4 Jun 2024 15:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717514342; cv=none; b=Wx5Jj2szk48x/0fJhGqfF541N+0FjyswEJ1l9icHMYDCH1J1/jP9nt5UawZPIr1UOOwBJODga6QuxVuTRWVLry995IPAwczriWtakL1In1opm0ZWdiRi3Z9DWxxxn7d7WKQreo5E1lOAsSaEYS/R+hmqgOEizN3rq6pj+Aq3ObQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717514342; c=relaxed/simple; bh=SgYhZ1mbIunBtwN4LKIszTbrQvB7J8eU/XbTXIjeK1I=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=TB+VotbM6doXY6PzfCYAEa5gSF0qYKcEdZ4q35KGjW4XYGw4hooa09FWzCQJvh4aDkZgIlf4KjIobc/yL19wa8qnh2+cXNeVhvy5+xktqyBqTCOa3kVIs2xdW1Us9scc90Knt/VvQlZvKt/8SWKoHRUDnZ2xkafeCp+Iq5xEbfU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MyrZhOp1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MyrZhOp1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AEDCC2BBFC; Tue, 4 Jun 2024 15:18:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717514342; bh=SgYhZ1mbIunBtwN4LKIszTbrQvB7J8eU/XbTXIjeK1I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MyrZhOp15I4XFkFD+6fehBKN2mI4y5rGUfIh9flVaQMTk7j+KqUkgTuT4qKqbjHZB q333b3h11kdC3Wc+/3qNCGkLw8D6Z++35usa8mQ81mqSAD+zMFIquk2uX+Nn7u97B7 c8d4Zu8BgGuSobzdZdqks9FnbB2gYB2UAfZZP/GV+HyY0d6pYuqBsL3hVHGHgQ7fiY yG1tQoTjmARwBu8+y40vGzGxjBk72VffHwwN1Z/L61agKiHL3vIJ800ryuLvQE5zGQ 4JIlzAEEzVxRTEet/DZexud0+/HeIdANRcpFtK/iDyiYApg0WRrRVOzJdIIGZRAeMC RU8uo0vqYXLng== Date: Tue, 4 Jun 2024 16:18:55 +0100 From: Simon Horman To: Yan Zhai Cc: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Abhishek Chauhan , Mina Almasry , Florian Westphal , Alexander Lobakin , David Howells , Jiri Pirko , Daniel Borkmann , Sebastian Andrzej Siewior , Lorenzo Bianconi , Pavel Begunkov , linux-kernel@vger.kernel.org, kernel-team@cloudflare.com, Jesper Dangaard Brouer Subject: Re: [RFC v2 net-next 7/7] af_packet: use sk_skb_reason_drop to free rx packets Message-ID: <20240604151855.GT491852@kernel.org> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Fri, May 31, 2024 at 06:43:00PM -0700, Yan Zhai wrote: > Replace kfree_skb_reason with sk_skb_reason_drop and pass the receiving > socket to the tracepoint. > > Signed-off-by: Yan Zhai > --- > net/packet/af_packet.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c > index fce390887591..3133d4eb4a1b 100644 > --- a/net/packet/af_packet.c > +++ b/net/packet/af_packet.c Hi Yan Zhai, Near the top of packet_rcv, immediately after local variable declarations, and before sk is initialised is the following: if (skb->pkt_type == PACKET_LOOPBACK) goto drop; > @@ -2226,7 +2226,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, > skb->len = skb_len; > } > drop: > - kfree_skb_reason(skb, drop_reason); > + sk_skb_reason_drop(sk, skb, drop_reason); So sk may be used uninitialised here. Similarly in tpacket_rcv() Flagged by clang-18 W=1 allmodconfig builds on x86_64. > return 0; > } > > @@ -2494,7 +2494,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, > skb->len = skb_len; > } > drop: > - kfree_skb_reason(skb, drop_reason); > + sk_skb_reason_drop(sk, skb, drop_reason); > return 0; > > drop_n_account: > @@ -2503,7 +2503,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, > drop_reason = SKB_DROP_REASON_PACKET_SOCK_ERROR; > > sk->sk_data_ready(sk); > - kfree_skb_reason(copy_skb, drop_reason); > + sk_skb_reason_drop(sk, copy_skb, drop_reason); > goto drop_n_restore; > } > > -- > 2.30.2 > >