Commit 18a2615c authored Jan 31, 2021 by Kumar Kartikeya Dwivedi Committed by Greg Kroah-Hartman Feb 04, 2021

staging: wimax: Switch from strlcpy to strscpy



strlcpy is marked as deprecated in Documentation/process/deprecated.rst,
and there is no functional difference when the caller expects truncation
(when not checking the return value). strscpy is relatively better as it
also avoids scanning the whole source string.

This silences the related checkpatch warnings from:
5dbdb2d8 ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210131172838.146706-14-memxor@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9c15db83

drivers/staging/wimax/i2400m/netdev.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -561,11 +561,11 @@ static void i2400m_get_drvinfo(struct net_device *net_dev,
		{
		struct i2400m *i2400m = net_dev_to_i2400m(net_dev);

		strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
		strlcpy(info->fw_version, i2400m->fw_name ? : "",
		strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
		strscpy(info->fw_version, i2400m->fw_name ? : "",
		sizeof(info->fw_version));
		if (net_dev->dev.parent)
		strlcpy(info->bus_info, dev_name(net_dev->dev.parent),
		strscpy(info->bus_info, dev_name(net_dev->dev.parent),
		sizeof(info->bus_info));
		}

drivers/staging/wimax/i2400m/usb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -333,8 +333,8 @@ static void i2400mu_get_drvinfo(struct net_device *net_dev,
		struct i2400mu *i2400mu = container_of(i2400m, struct i2400mu, i2400m);
		struct usb_device *udev = i2400mu->usb_dev;

		strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
		strlcpy(info->fw_version, i2400m->fw_name ? : "",
		strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
		strscpy(info->fw_version, i2400m->fw_name ? : "",
		sizeof(info->fw_version));
		usb_make_path(udev, info->bus_info, sizeof(info->bus_info));
		}