Commit 529a8f93 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

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 30035e45 ("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: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent bc986391

net/batman-adv/soft-interface.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -943,10 +943,10 @@ static const struct net_device_ops batadv_netdev_ops = { 
static void batadv_get_drvinfo(struct net_device *dev,

static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

			       struct ethtool_drvinfo *info)

{

{

	strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));

	strscpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));

	strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));

	strscpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));

	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strscpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strlcpy(info->bus_info, "batman", sizeof(info->bus_info));

	strscpy(info->bus_info, "batman", sizeof(info->bus_info));

}

}





/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702

/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702

net/batman-adv/sysfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1070,7 +1070,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, 
	dev_hold(net_dev);

	dev_hold(net_dev);

	INIT_WORK(&store_work->work, batadv_store_mesh_iface_work);

	INIT_WORK(&store_work->work, batadv_store_mesh_iface_work);

	store_work->net_dev = net_dev;

	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));

		sizeof(store_work->soft_iface_name));





	queue_work(batadv_event_workqueue, &store_work->work);

	queue_work(batadv_event_workqueue, &store_work->work);

CRA Git | Maintained and supported by SUSTech CRA and CCSE