net: 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>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for CAN
Link: https://lore.kernel.org/r/20220830201457.7984-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index f475eef14390cb7badfbc714b25b826cda13b002..83214e2e70abc89d5fc9c32b6008eae53503d16f 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -68,7 +68,7 @@ static int netdev_boot_setup_add(char *name, struct ifmap *map)
        for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {
                if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {
                        memset(s[i].name, 0, sizeof(s[i].name));
-                       strlcpy(s[i].name, name, IFNAMSIZ);
+                       strscpy(s[i].name, name, IFNAMSIZ);
                        memcpy(&s[i].map, map, sizeof(s[i].map));
                        break;
                }

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2f4da2c13c0af98c857011e713523b7bbb57a7cc..dc618bf51c5e5d52e617b882672173676a4e3dd9 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5619,7 +5619,7 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,
 static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
                                     struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
+       strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d",
                 BOND_ABI_VERSION);
 }

diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index 131a084c35351e921ed0d835e33a67f7373974d3..ebd5941c3f53038f884dde3ec3139454b1379185 100644 (file)
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -478,7 +478,7 @@ static void pcan_free_channels(struct pcan_pccard *card)
                if (!netdev)
                        continue;
 
-               strlcpy(name, netdev->name, IFNAMSIZ);
+               strscpy(name, netdev->name, IFNAMSIZ);
 
                unregister_sja1000dev(netdev);
 

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 8c9d53f6e24c383a1133feea09de6a4a8b792222..225697d70a9aa3a7c9bb21b1617eecc9228d14b1 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -962,7 +962,7 @@ static void peak_usb_disconnect(struct usb_interface *intf)
 
                dev_prev_siblings = dev->prev_siblings;
                dev->state &= ~PCAN_USB_STATE_CONNECTED;
-               strlcpy(name, netdev->name, IFNAMSIZ);
+               strscpy(name, netdev->name, IFNAMSIZ);
 
                unregister_netdev(netdev);
 

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 48cf344750ffdfce53704de46927bea24d10fd7a..59cdfc51ce06a0de3fb644eae5eebe4fe2dd9b21 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -972,7 +972,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,
 
        if (stringset == ETH_SS_STATS) {
                for (i = 0; i < mib_size; i++)
-                       strlcpy(data + i * ETH_GSTRING_LEN,
+                       strscpy(data + i * ETH_GSTRING_LEN,
                                mibs[i].name, ETH_GSTRING_LEN);
        } else if (stringset == ETH_SS_PHY_STATS) {
                phydev = b53_get_phy_device(ds, port);

diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c
index edbe5e7f1cb6b134c9c7b69dc3fdedc1c7dc92b4..22bc295bebdbeb125d7f4cb66ec0851b17d5b420 100644 (file)
--- a/drivers/net/dsa/bcm_sf2_cfp.c
+++ b/drivers/net/dsa/bcm_sf2_cfp.c
@@ -1296,7 +1296,7 @@ void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port,
                                 "CFP%03d_%sCntr",
                                 i, bcm_sf2_cfp_stats[j].name);
                        iter = (i - 1) * s + j;
-                       strlcpy(data + iter * ETH_GSTRING_LEN,
+                       strscpy(data + iter * ETH_GSTRING_LEN,
                                buf, ETH_GSTRING_LEN);
                }
        }

diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
index 01f90994dedd62c4dde4114a8eb86ba93bc42475..ea8bbfce0f1f0d186e8b0c91f23bd1563f247210 100644 (file)
--- a/drivers/net/dsa/hirschmann/hellcreek.c
+++ b/drivers/net/dsa/hirschmann/hellcreek.c
@@ -288,7 +288,7 @@ static void hellcreek_get_strings(struct dsa_switch *ds, int port,
        for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) {
                const struct hellcreek_counter *counter = &hellcreek_counter[i];
 
-               strlcpy(data + i * ETH_GSTRING_LEN,
+               strscpy(data + i * ETH_GSTRING_LEN,
                        counter->name, ETH_GSTRING_LEN);
        }
 }

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 6403f1f8bdbbd0735ba979e8cafbc933a9df7bd3..6f4ea39ab466f4c1faefc19a0bfca6a46fa51ce0 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1136,7 +1136,7 @@ static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data)
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++)
-               strlcpy(data + i * ETH_GSTRING_LEN,
+               strscpy(data + i * ETH_GSTRING_LEN,
                        mv88e6xxx_atu_vtu_stats_strings[i],
                        ETH_GSTRING_LEN);
 }

diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index f82ad741950824afab584fca668137be76d42c7d..aa0fc00faecbe89f23044a3b8c1176513ccac418 100644 (file)
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -102,7 +102,7 @@ static const struct net_device_ops dummy_netdev_ops = {
 static void dummy_get_drvinfo(struct net_device *dev,
                              struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
 }
 
 static const struct ethtool_ops dummy_ethtool_ops = {

diff --git a/drivers/net/fjes/fjes_ethtool.c b/drivers/net/fjes/fjes_ethtool.c
index 746736c83873702ee30114f5bce45b32ce7352eb..19c99529566b3d574a9e47aa0f9c92abe6219153 100644 (file)
--- a/drivers/net/fjes/fjes_ethtool.c
+++ b/drivers/net/fjes/fjes_ethtool.c
@@ -151,11 +151,11 @@ static void fjes_get_drvinfo(struct net_device *netdev,
 
        plat_dev = adapter->plat_dev;
 
-       strlcpy(drvinfo->driver, fjes_driver_name, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, fjes_driver_version,
+       strscpy(drvinfo->driver, fjes_driver_name, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, fjes_driver_version,
                sizeof(drvinfo->version));
 
-       strlcpy(drvinfo->fw_version, "none", sizeof(drvinfo->fw_version));
+       strscpy(drvinfo->fw_version, "none", sizeof(drvinfo->fw_version));
        snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info),
                 "platform:%s", plat_dev->name);
 }

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 01aa94776ce30833a0641cc63d50f8738df2c60a..f393e454f45ca1cda064f112cb2ba1742569d4e7 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1197,8 +1197,8 @@ static const struct net_device_ops geneve_netdev_ops = {
 static void geneve_get_drvinfo(struct net_device *dev,
                               struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->version, GENEVE_NETDEV_VER, sizeof(drvinfo->version));
-       strlcpy(drvinfo->driver, "geneve", sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, GENEVE_NETDEV_VER, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, "geneve", sizeof(drvinfo->driver));
 }
 
 static const struct ethtool_ops geneve_ethtool_ops = {

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 8297411e87ea06914a5ee2c466d7a0dd1346f948..a6184d6c7b15f291b1e63f3b7ea891ac2930c7fc 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -600,7 +600,7 @@ static int hdlcdrv_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
 
        case HDLCDRVCTL_DRIVERNAME:
                if (s->ops && s->ops->drvname) {
-                       strlcpy(bi.data.drivername, s->ops->drvname,
+                       strscpy(bi.data.drivername, s->ops->drvname,
                                sizeof(bi.data.drivername));
                        break;
                }

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 15ebd54266049794f913e11a58bc40785c56f161..5f08482065cab3d61c60f9a6e9ceb5a3ac882ecc 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -935,8 +935,8 @@ int netvsc_recv_callback(struct net_device *net,
 static void netvsc_get_drvinfo(struct net_device *net,
                               struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-       strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+       strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       strscpy(info->fw_version, "N/A", sizeof(info->fw_version));
 }
 
 static void netvsc_get_channels(struct net_device *net,

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 49ba8a50dfb1e169beb137296fb3d3c1cfde4c19..54c94a69c2bb8df851f03bb0effe950fd72a93bb 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -408,8 +408,8 @@ static int ipvlan_ethtool_get_link_ksettings(struct net_device *dev,
 static void ipvlan_ethtool_get_drvinfo(struct net_device *dev,
                                       struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->driver, IPVLAN_DRV, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, IPV_DRV_VER, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, IPVLAN_DRV, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, IPV_DRV_VER, sizeof(drvinfo->version));
 }
 
 static u32 ipvlan_ethtool_get_msglevel(struct net_device *dev)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 1080d6ebff63b6ffb89dfec1b298c5fc2bcbbd8d..713e3354cb2eb14cbf4009e67858c261508a037b 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1043,8 +1043,8 @@ static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
 static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
                                        struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->driver, "macvlan", sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, "macvlan", sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, "0.1", sizeof(drvinfo->version));
 }
 
 static int macvlan_ethtool_get_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 21a0435c02de6c44e5175d0f204c255c0e22ddd5..7a28e082436e4a3a5a9e11a3711b666e5735c406 100644 (file)
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -324,8 +324,8 @@ static const struct net_device_ops failover_dev_ops = {
 static void nfo_ethtool_get_drvinfo(struct net_device *dev,
                                    struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->driver, FAILOVER_NAME, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, FAILOVER_VERSION, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, FAILOVER_NAME, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, FAILOVER_VERSION, sizeof(drvinfo->version));
 }
 
 static int nfo_ethtool_get_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index ddac61d79145ead755124358a22f7feebad3b1e2..bdff9ac5056dd6500b1ba4d4186ac3b22a08d892 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(oops_only, "Only log oops messages");
 #ifndef        MODULE
 static int __init option_setup(char *opt)
 {
-       strlcpy(config, opt, MAX_PARAM_LENGTH);
+       strscpy(config, opt, MAX_PARAM_LENGTH);
        return 1;
 }
 __setup("netconsole=", option_setup);
@@ -178,7 +178,7 @@ static struct netconsole_target *alloc_param_target(char *target_config)
                goto fail;
 
        nt->np.name = "netconsole";
-       strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
+       strscpy(nt->np.dev_name, "eth0", IFNAMSIZ);
        nt->np.local_port = 6665;
        nt->np.remote_port = 6666;
        eth_broadcast_addr(nt->np.remote_mac);
@@ -414,7 +414,7 @@ static ssize_t dev_name_store(struct config_item *item, const char *buf,
                return -EINVAL;
        }
 
-       strlcpy(nt->np.dev_name, buf, IFNAMSIZ);
+       strscpy(nt->np.dev_name, buf, IFNAMSIZ);
 
        /* Get rid of possible trailing newline from echo(1) */
        len = strnlen(nt->np.dev_name, IFNAMSIZ);
@@ -630,7 +630,7 @@ static struct config_item *make_netconsole_target(struct config_group *group,
                return ERR_PTR(-ENOMEM);
 
        nt->np.name = "netconsole";
-       strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
+       strscpy(nt->np.dev_name, "eth0", IFNAMSIZ);
        nt->np.local_port = 6665;
        nt->np.remote_port = 6666;
        eth_broadcast_addr(nt->np.remote_mac);
@@ -708,7 +708,7 @@ restart:
                if (nt->np.dev == dev) {
                        switch (event) {
                        case NETDEV_CHANGENAME:
-                               strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ);
+                               strscpy(nt->np.dev_name, dev->name, IFNAMSIZ);
                                break;
                        case NETDEV_RELEASE:
                        case NETDEV_JOIN:

diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index 80bdc07f2cd33c8b68827db83d38d96ccba03709..464d88ca8ab0af9e5625a6d640629a80a037e09b 100644 (file)
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -364,9 +364,9 @@ static void ntb_get_drvinfo(struct net_device *ndev,
 {
        struct ntb_netdev *dev = netdev_priv(ndev);
 
-       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-       strlcpy(info->version, NTB_NETDEV_VER, sizeof(info->version));
-       strlcpy(info->bus_info, pci_name(dev->pdev), sizeof(info->bus_info));
+       strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       strscpy(info->version, NTB_NETDEV_VER, sizeof(info->version));
+       strscpy(info->bus_info, pci_name(dev->pdev), sizeof(info->bus_info));
 }
 
 static int ntb_get_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index ee374a85544a635f3711de9bca8083ff5221b2f3..134637584a83856ebce07e59a634d489655e2ed3 100644 (file)
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -749,7 +749,7 @@ static void adin_get_strings(struct phy_device *phydev, u8 *data)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) {
-               strlcpy(&data[i * ETH_GSTRING_LEN],
+               strscpy(&data[i * ETH_GSTRING_LEN],
                        adin_hw_stats[i].string, ETH_GSTRING_LEN);
        }
 }

diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c
index 287cccf8f7f4e5417d2750609e40ec9e393cee2a..b2c0baa51f39ebad65a51d65e0e9c0f12bc03133 100644 (file)
--- a/drivers/net/phy/bcm-phy-lib.c
+++ b/drivers/net/phy/bcm-phy-lib.c
@@ -519,7 +519,7 @@ void bcm_phy_get_strings(struct phy_device *phydev, u8 *data)
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)
-               strlcpy(data + i * ETH_GSTRING_LEN,
+               strscpy(data + i * ETH_GSTRING_LEN,
                        bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);
 }
 EXPORT_SYMBOL_GPL(bcm_phy_get_strings);

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a714150f5e8cda1c0610b7f40b817992537e4cdd..a3e810705ce22f7a7242c0f9abfa39ad94d06869 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1952,7 +1952,7 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data)
        int i;
 
        for (i = 0; i < count; i++) {
-               strlcpy(data + i * ETH_GSTRING_LEN,
+               strscpy(data + i * ETH_GSTRING_LEN,
                        marvell_hw_stats[i].string, ETH_GSTRING_LEN);
        }
 }

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index e78d0bf69bc3eec1259e802cb2fdf244cf82b2f6..16301634b44e312ef9c9dd82208c41a5a13d76dd 100644 (file)
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -1650,7 +1650,7 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {
-               strlcpy(data + i * ETH_GSTRING_LEN,
+               strscpy(data + i * ETH_GSTRING_LEN,
                        kszphy_hw_stats[i].string, ETH_GSTRING_LEN);
        }
 }

diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
index 7e3017e7a1c0324746f1e53a068a70eddacdbea3..8a13b1ad9a330b599742fc40a5d540ec3dcc0c3f 100644 (file)
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -136,7 +136,7 @@ static void vsc85xx_get_strings(struct phy_device *phydev, u8 *data)
                return;
 
        for (i = 0; i < priv->nstats; i++)
-               strlcpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string,
+               strscpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string,
                        ETH_GSTRING_LEN);
 }
 

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 12ff276b80aed7e22a817c940907f59d17ea8ad7..2198f1302642d5b17e2696f4fa2ed7cc6b70e701 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -370,7 +370,7 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
        if (!fixup)
                return -ENOMEM;
 
-       strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id));
+       strscpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id));
        fixup->phy_uid = phy_uid;
        fixup->phy_uid_mask = phy_uid_mask;
        fixup->run = run;

diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 39e61e07e4894aa3eb6bffc9710a853a9da0aca3..fbcb9d05da649ebda37aa2440cf5893ab838aa43 100644 (file)
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -443,10 +443,10 @@ static void rionet_get_drvinfo(struct net_device *ndev,
 {
        struct rionet_private *rnet = netdev_priv(ndev);
 
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-       strlcpy(info->fw_version, "n/a", sizeof(info->fw_version));
-       strlcpy(info->bus_info, rnet->mport->name, sizeof(info->bus_info));
+       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strscpy(info->version, DRV_VERSION, sizeof(info->version));
+       strscpy(info->fw_version, "n/a", sizeof(info->fw_version));
+       strscpy(info->bus_info, rnet->mport->name, sizeof(info->bus_info));
 }
 
 static u32 rionet_get_msglevel(struct net_device *ndev)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index b1e1239dfadef6296a3e7539104355d3083378a5..ab92416d861ff25545963da4fa5992e842a6e712 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2070,8 +2070,8 @@ static const struct net_device_ops team_netdev_ops = {
 static void team_ethtool_get_drvinfo(struct net_device *dev,
                                     struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
 }
 
 static int team_ethtool_get_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 259b2b84b2b39453cb3de27c632cf9bc0f9ce2b7..3732e51b5ad8d7ac3dca1dfd11eed29168331432 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -3540,15 +3540,15 @@ static void tun_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
 {
        struct tun_struct *tun = netdev_priv(dev);
 
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strscpy(info->version, DRV_VERSION, sizeof(info->version));
 
        switch (tun->flags & TUN_TYPE_MASK) {
        case IFF_TUN:
-               strlcpy(info->bus_info, "tun", sizeof(info->bus_info));
+               strscpy(info->bus_info, "tun", sizeof(info->bus_info));
                break;
        case IFF_TAP:
-               strlcpy(info->bus_info, "tap", sizeof(info->bus_info));
+               strscpy(info->bus_info, "tap", sizeof(info->bus_info));
                break;
        }
 }

diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 3020e81159d0223f1e088a394ffed3ed2fcdb632..a017e9de2119d5f5163981b9777e13e94f523f86 100644 (file)
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -201,7 +201,7 @@ static void aqc111_get_drvinfo(struct net_device *net,
 
        /* Inherit standard device info */
        usbnet_get_drvinfo(net, info);
-       strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+       strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
        snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u",
                 aqc111_data->fw_ver.major,
                 aqc111_data->fw_ver.minor,

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 9ea91c3ff0458ca39a32564c45ca0e90f6b24b14..72ffc89b477ad81b2cd810b43f3cccedd8044b1e 100644 (file)
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -752,8 +752,8 @@ void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
 {
        /* Inherit standard device info */
        usbnet_get_drvinfo(net, info);
-       strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
 }
 
 int asix_set_mac_address(struct net_device *net, void *p)

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 843893482abd637b21c5c273fdbaa7effe97e646..ff439ef535ac9bd7ce0d1160544df591c34478aa 100644 (file)
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -672,8 +672,8 @@ static void catc_get_drvinfo(struct net_device *dev,
                             struct ethtool_drvinfo *info)
 {
        struct catc *catc = netdev_priv(dev);
-       strlcpy(info->driver, driver_name, sizeof(info->driver));
-       strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, driver_name, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
        usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info));
 }
 

diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index feb247e355f74c04319484a068bfd767c54ffb28..81ca64debc5b9441a100846265d99550ed5b7307 100644 (file)
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -894,7 +894,7 @@ static void pegasus_get_drvinfo(struct net_device *dev,
 {
        pegasus_t *pegasus = netdev_priv(dev);
 
-       strlcpy(info->driver, driver_name, sizeof(info->driver));
+       strscpy(info->driver, driver_name, sizeof(info->driver));
        usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
 }
 

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 688905ea0a6d3bb9436a3c6a3b4823ef592e6766..45dcc3fc526dd6d843a5918fb44b73082f5eadc1 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -8602,11 +8602,11 @@ static void rtl8152_get_drvinfo(struct net_device *netdev,
 {
        struct r8152 *tp = netdev_priv(netdev);
 
-       strlcpy(info->driver, MODULENAME, sizeof(info->driver));
-       strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, MODULENAME, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
        usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info));
        if (!IS_ERR_OR_NULL(tp->rtl_fw.fw))
-               strlcpy(info->fw_version, tp->rtl_fw.version,
+               strscpy(info->fw_version, tp->rtl_fw.version,
                        sizeof(info->fw_version));
 }
 

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 3d2bf2acca942dc94b6cd6c335fd6fe0b9711ea3..97afd7335d8685581b317c3a5311bccfd1679770 100644 (file)
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -769,8 +769,8 @@ static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinf
 {
        rtl8150_t *dev = netdev_priv(netdev);
 
-       strlcpy(info->driver, driver_name, sizeof(info->driver));
-       strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, driver_name, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
        usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
 }
 

diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index bb4cbe8fc846bd866e51f7991ff6145995c655c5..b3ae949e6f1c54e11e082f19435913cec0a0fccf 100644 (file)
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -612,8 +612,8 @@ static void sierra_net_get_drvinfo(struct net_device *net,
 {
        /* Inherit standard device info */
        usbnet_get_drvinfo(net, info);
-       strlcpy(info->driver, driver_name, sizeof(info->driver));
-       strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, driver_name, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
 }
 
 static u32 sierra_net_get_link(struct net_device *net)

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index aaa89b4cfd507b51c6c339bc1b16d0cf40d34181..fd399a8ed973fcdc1077233e7b091ffef73bdd56 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1050,9 +1050,9 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
 {
        struct usbnet *dev = netdev_priv(net);
 
-       strlcpy (info->driver, dev->driver_name, sizeof info->driver);
-       strlcpy (info->fw_version, dev->driver_info->description,
-               sizeof info->fw_version);
+       strscpy(info->driver, dev->driver_name, sizeof(info->driver));
+       strscpy(info->fw_version, dev->driver_info->description,
+               sizeof(info->fw_version));
        usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
 }
 EXPORT_SYMBOL_GPL(usbnet_get_drvinfo);

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 466da01ba2e3e97ba9eb16586b6d5d9f092b3d76..550c85a366a0eb8bbfedc4813d44daa73f0a4398 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -128,8 +128,8 @@ static int veth_get_link_ksettings(struct net_device *dev,
 
 static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strscpy(info->version, DRV_VERSION, sizeof(info->version));
 }
 
 static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9cce7dec7366d41816f0e09ce9342d9869ea9ac9..e0e57083d4420282868826a86bd51e034d001805 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2594,9 +2594,9 @@ static void virtnet_get_drvinfo(struct net_device *dev,
        struct virtnet_info *vi = netdev_priv(dev);
        struct virtio_device *vdev = vi->vdev;
 
-       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-       strlcpy(info->version, VIRTNET_DRIVER_VERSION, sizeof(info->version));
-       strlcpy(info->bus_info, virtio_bus_name(vdev), sizeof(info->bus_info));
+       strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       strscpy(info->version, VIRTNET_DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->bus_info, virtio_bus_name(vdev), sizeof(info->bus_info));
 
 }
 

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index e2034adc3a1a77c63310bfd1786b0101bad2d993..18cf7c7232010d8985ee4b4a00c181a26c4bd5a1 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -209,12 +209,12 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 
-       strlcpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver));
+       strscpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver));
 
-       strlcpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT,
+       strscpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT,
                sizeof(drvinfo->version));
 
-       strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
+       strscpy(drvinfo->bus_info, pci_name(adapter->pdev),
                sizeof(drvinfo->bus_info));
 }
 

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 5df7a0abc39d5f123bdb51891455551fc623b6c4..badf6f09ae51ceaa0abfef0a3551d0060c8b8d5d 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -1541,8 +1541,8 @@ static const struct l3mdev_ops vrf_l3mdev_ops = {
 static void vrf_get_drvinfo(struct net_device *dev,
                            struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strscpy(info->version, DRV_VERSION, sizeof(info->version));
 }
 
 static const struct ethtool_ops vrf_ethtool_ops = {

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 1a47d04f5d1a27b122ab8271fddeac6eff60ed0b..6ab669dcd1c6c2a17e3fe134b2c30633088f1fe8 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -3310,8 +3310,8 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[],
 static void vxlan_get_drvinfo(struct net_device *netdev,
                              struct ethtool_drvinfo *drvinfo)
 {
-       strlcpy(drvinfo->version, VXLAN_VERSION, sizeof(drvinfo->version));
-       strlcpy(drvinfo->driver, "vxlan", sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, VXLAN_VERSION, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, "vxlan", sizeof(drvinfo->driver));
 }
 
 static int vxlan_get_link_ksettings(struct net_device *dev,