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 CBE8F1448F1; Tue, 27 Feb 2024 13:46:01 +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=1709041561; cv=none; b=GLRyMC+LgAjve/rgPgNe7NsRvedgvQM3bJXne+DOWdOBeayoLCcSm/CHlglL9J8mvQQJxBzc5wHi4dkN7hyxSCJK8GxcBRI4YbFElD7A8dyFfjDn2oTQWo3uBpNCwSfmVIMvBLPCUMo02GfndMEa81kHDHhlRSbmh25C4m+4fkI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709041561; c=relaxed/simple; bh=gWtiIocPhib70R5cOC+GM5+X626KWd8yuhmSZIS4nbQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JgB+CBr9lXT2BvZpX42E2iDQSRClKrcjWL9R1yKA1S5AB/DZciIQ13pT4NLgfPifyGgDMODxvjEvkxidtMGCTlT1uKrX7MMnxw319EZAEypvHnuaH8lvwRYysyHnfAF97s/7m6MUlEOEE9igWTJ5yUxPyhAMYU3mtM/kBZe8gJ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=d3sXteTw; 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="d3sXteTw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50442C433F1; Tue, 27 Feb 2024 13:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709041561; bh=gWtiIocPhib70R5cOC+GM5+X626KWd8yuhmSZIS4nbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d3sXteTwHRvCb1v6BHshNho9auVZfFa94uQ+4LzGAdxfrG5ycWnSwMDt4f4/UDoqd fnYA9I3mP2muAXlkB8yQFffUzNad7Afr/G79vS5k7WzV1lgOHJHpD+DXAikRydSCNj 64CfDb2MslEVnVd25cY9fFiC3C52A1rKJ2gCKhzs= 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 4.19 46/52] packet: move from strlcpy with unused retval to strscpy Date: Tue, 27 Feb 2024 14:26:33 +0100 Message-ID: <20240227131550.048122231@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131548.514622258@linuxfoundation.org> References: <20240227131548.514622258@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 4.19-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 377832981178d..e8b05769d1c9a 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1850,7 +1850,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; /* @@ -3501,7 +3501,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