batman-adv: Replace usage of strlcpy with strscpy

The strscpy was introduced to fix some API problems around strlcpy. And
checkpatch started to report recently that strlcpy is deprecated and
strscpy is preferred.

The functionality introduced in commit 30035e45753b ("string: provide
strscpy()") improves following points compared to strlcpy:

* it doesn't read from memory beyond (src + size)
* provides an easy way to check for destination buffer overflow
* robust against asynchronous source buffer changes

Since batman-adv doesn't depend on any of the previously mentioned behavior
changes, the usage of strlcpy can simply be replaced by strscpy to silence
checkpatch.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index c7a2e77..a1146cb 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -943,10 +943,10 @@ static const struct net_device_ops batadv_netdev_ops = {
 static void batadv_get_drvinfo(struct net_device *dev,
                               struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));
-       strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));
-       strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
-       strlcpy(info->bus_info, "batman", sizeof(info->bus_info));
+       strscpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));
+       strscpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));
+       strscpy(info->fw_version, "N/A", sizeof(info->fw_version));
+       strscpy(info->bus_info, "batman", sizeof(info->bus_info));
 }
 
 /* Inspired by drivers/net/ethernet/dlink/sundance.c:1702

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index 1efcb97..e5bbc28 100644 (file)
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -1070,7 +1070,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj,
        dev_hold(net_dev);
        INIT_WORK(&store_work->work, batadv_store_mesh_iface_work);
        store_work->net_dev = net_dev;
-       strlcpy(store_work->soft_iface_name, buff,
+       strscpy(store_work->soft_iface_name, buff,
                sizeof(store_work->soft_iface_name));
 
        queue_work(batadv_event_workqueue, &store_work->work);