Commit b7db5733 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

usb: move from strlcpy with unused retval to strscpy 

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/


Reviewed-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210116.7517-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4c2fac9

drivers/usb/atm/usbatm.c

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
	/* public fields */



	instance->driver = driver;

	strlcpy(instance->driver_name, driver->driver_name,

	strscpy(instance->driver_name, driver->driver_name,

		sizeof(instance->driver_name));



	instance->usb_dev = usb_dev;

drivers/usb/core/devio.c

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ static int proc_getdriver(struct usb_dev_state *ps, void __user *arg) 
	if (!intf || !intf->dev.driver)

		ret = -ENODATA;

	else {

		strlcpy(gd.driver, intf->dev.driver->name,

		strscpy(gd.driver, intf->dev.driver->name,

				sizeof(gd.driver));

		ret = (copy_to_user(arg, &gd, sizeof(gd)) ? -EFAULT : 0);

	}

drivers/usb/gadget/function/f_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -3700,7 +3700,7 @@ int ffs_name_dev(struct ffs_dev *dev, const char *name) 


	existing = _ffs_do_find_dev(name);

	if (!existing)

		strlcpy(dev->name, name, ARRAY_SIZE(dev->name));

		strscpy(dev->name, name, ARRAY_SIZE(dev->name));

	else if (existing != dev)

		ret = -EBUSY;

drivers/usb/gadget/function/f_uvc.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ uvc_register_video(struct uvc_device *uvc) 
	uvc->vdev.vfl_dir = VFL_DIR_TX;

	uvc->vdev.lock = &uvc->video.mutex;

	uvc->vdev.device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

	strlcpy(uvc->vdev.name, cdev->gadget->name, sizeof(uvc->vdev.name));

	strscpy(uvc->vdev.name, cdev->gadget->name, sizeof(uvc->vdev.name));



	video_set_drvdata(&uvc->vdev, uvc);

drivers/usb/gadget/function/u_ether.c

+4 −4
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) 
{

	struct eth_dev *dev = netdev_priv(net);



	strlcpy(p->driver, "g_ether", sizeof(p->driver));

	strlcpy(p->version, UETH__VERSION, sizeof(p->version));

	strlcpy(p->fw_version, dev->gadget->name, sizeof(p->fw_version));

	strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof(p->bus_info));

	strscpy(p->driver, "g_ether", sizeof(p->driver));

	strscpy(p->version, UETH__VERSION, sizeof(p->version));

	strscpy(p->fw_version, dev->gadget->name, sizeof(p->fw_version));

	strscpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof(p->bus_info));

}



/* REVISIT can also support: