l2tp: move from strlcpy with unused retval to strscpy
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 18 Aug 2022 21:02:21 +0000 (23:02 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 23 Aug 2022 00:59:46 +0000 (17:59 -0700)
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/20220818210222.8515-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/l2tp/l2tp_eth.c

index 6cd97c7..f2ae03c 100644 (file)
@@ -254,7 +254,7 @@ static int l2tp_eth_create(struct net *net, struct l2tp_tunnel *tunnel,
        int rc;
 
        if (cfg->ifname) {
-               strlcpy(name, cfg->ifname, IFNAMSIZ);
+               strscpy(name, cfg->ifname, IFNAMSIZ);
                name_assign_type = NET_NAME_USER;
        } else {
                strcpy(name, L2TP_ETH_DEV_NAME);
@@ -314,7 +314,7 @@ static int l2tp_eth_create(struct net *net, struct l2tp_tunnel *tunnel,
                return rc;
        }
 
-       strlcpy(session->ifname, dev->name, IFNAMSIZ);
+       strscpy(session->ifname, dev->name, IFNAMSIZ);
        rcu_assign_pointer(spriv->dev, dev);
 
        rtnl_unlock();