From nobody Fri Apr 10 22:00:38 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACAB9C00140 for ; Thu, 18 Aug 2022 21:13:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346984AbiHRVNZ (ORCPT ); Thu, 18 Aug 2022 17:13:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346836AbiHRVKg (ORCPT ); Thu, 18 Aug 2022 17:10:36 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 408A4D87E3 for ; Thu, 18 Aug 2022 14:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=k1; bh=bUmtebqKmi+74bKzN2BejawpQqd f3ysrdJRlrg1RT8Q=; b=b0Oz9Hn/m31YEppq2Sp/bWZVY+bJ6rOnS+YtNxeuE0q DEqRCkLesb34saLpocgLlu/Gsz6Wmavo5Vt6v7MHx3TgRXmyzL9RboPL4jt9UNID 9e/01Ww21kWPCwTfMnbvfja0dAT7GZ7ds8SxOqakwfqdT3oBwcN1SETEIxkDP2js = Received: (qmail 3963092 invoked from network); 18 Aug 2022 23:02:17 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 18 Aug 2022 23:02:17 +0200 X-UD-Smtp-Session: l3s3148p1@2BXqS4rmKbQucref From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Subject: [PATCH] dsa: move from strlcpy with unused retval to strscpy Date: Thu, 18 Aug 2022 23:02:16 +0200 Message-Id: <20220818210216.8419-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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-=3DwgfRnXz0W3D37d01q3JFkr_i_uTL=3DV6A6= G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang Reviewed-by: Andrew Lunn --- net/dsa/master.c | 2 +- net/dsa/slave.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/dsa/master.c b/net/dsa/master.c index 2851e44c4cf0..9e5dabc751d9 100644 --- a/net/dsa/master.c +++ b/net/dsa/master.c @@ -58,7 +58,7 @@ static void dsa_master_get_regs(struct net_device *dev, } =20 cpu_info =3D (struct ethtool_drvinfo *)data; - strlcpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver)); + strscpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver)); data +=3D sizeof(*cpu_info); cpu_regs =3D (struct ethtool_regs *)data; data +=3D sizeof(*cpu_regs); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index ad6a6663feeb..ce12c3427bad 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -826,9 +826,9 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, = struct net_device *dev) static void dsa_slave_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) { - strlcpy(drvinfo->driver, "dsa", sizeof(drvinfo->driver)); - strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version)); - strlcpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info)); + strscpy(drvinfo->driver, "dsa", sizeof(drvinfo->driver)); + strscpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version)); + strscpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info)); } =20 static int dsa_slave_get_regs_len(struct net_device *dev) --=20 2.35.1