net: move from strlcpy with unused retval to strscpy

[ Upstream commit 70986397a15bf337d4ca3215a65e30bbe95e5d3c ]

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>
Link: https://lore.kernel.org/r/20220818210215.8395-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 311cca40661f ("net: fix ifname in netlink ntf during netns move")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/core/dev.c b/net/core/dev.c
index d269c1760fa45b07d2c6d3c42da9eb47da459f17..af0e0ce53ca529a7fcef5dcec2c888ddd7cd6639 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1161,7 +1161,7 @@ static int dev_alloc_name_ns(struct net *net,
        BUG_ON(!net);
        ret = __dev_alloc_name(net, name, buf);
        if (ret >= 0)
-               strlcpy(dev->name, buf, IFNAMSIZ);
+               strscpy(dev->name, buf, IFNAMSIZ);
        return ret;
 }
 
@@ -1198,7 +1198,7 @@ static int dev_get_valid_name(struct net *net, struct net_device *dev,
        else if (netdev_name_in_use(net, name))
                return -EEXIST;
        else if (dev->name != name)
-               strlcpy(dev->name, name, IFNAMSIZ);
+               strscpy(dev->name, name, IFNAMSIZ);
 
        return 0;
 }

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 78202141930f418851970ef62ef59ce30088dc87..22015ebc1dd56081cb90d91add1d184930826c81 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -473,7 +473,7 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
                goto out;
 
        hw_entry = &hw_entries->entries[hw_entries->num_entries];
-       strlcpy(hw_entry->trap_name, metadata->trap_name,
+       strscpy(hw_entry->trap_name, metadata->trap_name,
                NET_DM_MAX_HW_TRAP_NAME_LEN - 1);
        hw_entry->count = 1;
        hw_entries->num_entries++;

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index bd750863959f2a29a3a0ddd76f148d2b40ab9446..47a86da6ab980030b2697cdddf389032c82c59b7 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -573,7 +573,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                if ((delim = strchr(cur, ',')) == NULL)
                        goto parse_failed;
                *delim = 0;
-               strlcpy(np->dev_name, cur, sizeof(np->dev_name));
+               strscpy(np->dev_name, cur, sizeof(np->dev_name));
                cur = delim;
        }
        cur++;
@@ -627,7 +627,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
        int err;
 
        np->dev = ndev;
-       strlcpy(np->dev_name, ndev->name, IFNAMSIZ);
+       strscpy(np->dev_name, ndev->name, IFNAMSIZ);
 
        if (ndev->priv_flags & IFF_DISABLE_NETPOLL) {
                np_err(np, "%s doesn't support polling, aborting\n",