OSDN Git Service

ethtool: move from strlcpy with unused retval to strscpy
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 18 Aug 2022 21:02:18 +0000 (23:02 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 23 Aug 2022 01:06:55 +0000 (18:06 -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/20220818210218.8443-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ethtool/ioctl.c

index 6a7308d..9298eb3 100644 (file)
@@ -714,16 +714,16 @@ ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp)
        const struct ethtool_ops *ops = dev->ethtool_ops;
 
        rsp->info.cmd = ETHTOOL_GDRVINFO;
-       strlcpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version));
+       strscpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version));
        if (ops->get_drvinfo) {
                ops->get_drvinfo(dev, &rsp->info);
        } else if (dev->dev.parent && dev->dev.parent->driver) {
-               strlcpy(rsp->info.bus_info, dev_name(dev->dev.parent),
+               strscpy(rsp->info.bus_info, dev_name(dev->dev.parent),
                        sizeof(rsp->info.bus_info));
-               strlcpy(rsp->info.driver, dev->dev.parent->driver->name,
+               strscpy(rsp->info.driver, dev->dev.parent->driver->name,
                        sizeof(rsp->info.driver));
        } else if (dev->rtnl_link_ops) {
-               strlcpy(rsp->info.driver, dev->rtnl_link_ops->kind,
+               strscpy(rsp->info.driver, dev->rtnl_link_ops->kind,
                        sizeof(rsp->info.driver));
        } else {
                return -EOPNOTSUPP;