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 2E647145FF7; Tue, 27 Feb 2024 14:30:28 +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=1709044228; cv=none; b=j0ls9uuBwr3VmYA9IMFwGGfMADX/q1WimAfE/2KnCzs7/ajF6bTBYDIuBlDy8uyHs6aGG4Ogfrrx/vyhpHz4akAZ1wrw3s4NsB9THTD5GME/f9wrpbNBSLLMKWS/4ycCl+bm7bq6fZv5t843Tbi35f3cQ5zu/kgjArnq9jKfMvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709044228; c=relaxed/simple; bh=06cWg8BQ6QuH5w45Smx8Lu1uGJFBZoachE1HYWycMtE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jUyySMTcf/xOqSDqn2gmXJOU6QUflIAGpNl9Yln5eXEXkWmvCVxpOZV1W+Du31OcLSNkhrah42OarwVZBOD6qTG24HqcXXaHKYjHHOOtKX3fIoUaWg2xee9rZEmZRhPedn41F4j3SOOXV/DBsf+AfQ/idDhfIgofuqp/uqRrP5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xJ1aNSbC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xJ1aNSbC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0791C433C7; Tue, 27 Feb 2024 14:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709044228; bh=06cWg8BQ6QuH5w45Smx8Lu1uGJFBZoachE1HYWycMtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xJ1aNSbCsyBdPaR6qSkGihtuDpoVT1MjzfgPJjHQE5zDnSRLp10DYMRGQVUPJAp38 rq6lNFZMiQpt5xRoXDrydTx5UoqWk1sOhOHq+4Z0VEZa47rbByZP1H5FQ3C+IzICUp 1r1HuebA4Mc9kulG4/ckA7JPxKx7oyJxt7Ep0fSA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wolfram Sang , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 109/122] packet: move from strlcpy with unused retval to strscpy Date: Tue, 27 Feb 2024 14:27:50 +0100 Message-ID: <20240227131602.270790620@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131558.694096204@linuxfoundation.org> References: <20240227131558.694096204@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wolfram Sang [ Upstream commit 8fc9d51ea2d32a05f7d7cf86a25cc86ecc57eb45 ] Follow the advice of the below link and prefer 'strscpy' in this subsystem. Conversion is 1:1 because the return value is not used. Generated by a coccinelle script. Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang Link: https://lore.kernel.org/r/20220818210227.8611-1-wsa+renesas@sang-engineering.com Signed-off-by: Jakub Kicinski Stable-dep-of: a7d6027790ac ("arp: Prevent overflow in arp_req_get().") Signed-off-by: Sasha Levin --- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b292d58fdcc4c..1052cbcdd3c8d 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1871,7 +1871,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, */ spkt->spkt_family = dev->type; - strlcpy(spkt->spkt_device, dev->name, sizeof(spkt->spkt_device)); + strscpy(spkt->spkt_device, dev->name, sizeof(spkt->spkt_device)); spkt->spkt_protocol = skb->protocol; /* @@ -3540,7 +3540,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr, rcu_read_lock(); dev = dev_get_by_index_rcu(sock_net(sk), READ_ONCE(pkt_sk(sk)->ifindex)); if (dev) - strlcpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data)); + strscpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data)); rcu_read_unlock(); return sizeof(*uaddr); -- 2.43.0