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 8C12313B29C; Tue, 27 Feb 2024 14:11:09 +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=1709043069; cv=none; b=luUCdfo3f9BLfusMQlIsQMM9pYNW0b8KTNOUHw2XhOFvp99EVcdvCwSu/Sq2oLNyJV3xn6SpYtStfXoSQI/b27vSF52TFcgkq8NMODSxPFriWf5In91CFEcy7kuNhKmVjMKSkHzr+zqTlUuWbMB8petLtj8/27/wRZ55xqYQIgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043069; c=relaxed/simple; bh=aWAwSp4d1qsS6WLy4197VDB607HePfE3Ubm56GyVnVk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UJLny4icwCpP0lAYrb40paO3nSfBb2yeijitsDzLKsZZe4h259SlYkLmeRJszW2ri4vmxzotmRFob1IAMoCol3QKYIzooX1VQeyAx1y+Cct931u3v3ink3kQkMvNhEY9zwb7BiI4/wazC04jq9N0jDZEgLrKXa3LXIgCU9OYopg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uznSxXDn; 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="uznSxXDn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD9B1C433F1; Tue, 27 Feb 2024 14:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709043069; bh=aWAwSp4d1qsS6WLy4197VDB607HePfE3Ubm56GyVnVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uznSxXDnvJPiVRIOR91Dvd0R4PM6SGFjGx5AgIynA5LSsnLjgMnmFxvPOMH1A8Lo2 YkKPyi+k0VYdMjezboBx6GUJzj2hzHyiK2dFGH/fveOMq5Nq3y5O+sO0r3bnAIGDgo O9He28UUSoW43FFInWH06OlTBVAargVyAhNLG6bs= 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.15 223/245] packet: move from strlcpy with unused retval to strscpy Date: Tue, 27 Feb 2024 14:26:51 +0100 Message-ID: <20240227131622.438595259@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131615.098467438@linuxfoundation.org> References: <20240227131615.098467438@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.15-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 e7b54f7214110..d62f79cf873dd 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1874,7 +1874,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