dsa: move from strlcpy with unused retval to strscpy

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 <wsa+renesas@sang-engineering.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220818210216.8419-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/master.c b/net/dsa/master.c
index 2851e44c4cf0dc5860f7e60545f5c346c7ecf6bd..9e5dabc751d933c4e8332b535d170606806d271d 100644 (file)
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -58,7 +58,7 @@ static void dsa_master_get_regs(struct net_device *dev,
        }
 
        cpu_info = (struct ethtool_drvinfo *)data;
-       strlcpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver));
+       strscpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver));
        data += sizeof(*cpu_info);
        cpu_regs = (struct ethtool_regs *)data;
        data += sizeof(*cpu_regs);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index ad6a6663feeb5ecce4559dcb783608edb82030c2..ce12c3427bad73aef6049efbbf8a161d377225ce 100644 (file)
--- 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));
 }
 
 static int dsa_slave_get_regs_len(struct net_device *dev)