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: Richard Leitner <richard.leitner@skidata.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210116.7517-1-wsa+renesas@sang-engineering.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 362217189ef315654cc6b8f245954c4d42740302..1cdb8758ae01b1c83d47023e67569bdc0096f50f 100644 (file)
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -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;

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index b5b85bf80329888b6b3fc60d200d5bddf1bb1af3..837f3e57f5809bf574d6443f418871bc2cc8fd39 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -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);
        }

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index e0fa4b186ec6d21e037eeb76737b49c09c3ee88a..98dc2291e9a10a1da14e8ce040fe0ad9f8e9084d 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -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;
 

diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 71669e0e4d0074d4125acee5800f143515ad0007..f4f6cf75930bebc244e2a75eff6770514bb15d95 100644 (file)
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -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);
 

diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 7887def05dc2d8e2ab79dd7b7947defce527665a..e06022873df16a357a2ba5b6f82f64b7c4cb081e 100644 (file)
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -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:

diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index fd8f73bb726dd1589f885b096562934af511df1f..511f106f984375ced39f83f3d54c0df18acb037d 100644 (file)
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -67,9 +67,9 @@ uvc_v4l2_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
        struct uvc_device *uvc = video_get_drvdata(vdev);
        struct usb_composite_dev *cdev = uvc->func.config->cdev;
 
-       strlcpy(cap->driver, "g_uvc", sizeof(cap->driver));
-       strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card));
-       strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev),
+       strscpy(cap->driver, "g_uvc", sizeof(cap->driver));
+       strscpy(cap->card, cdev->gadget->name, sizeof(cap->card));
+       strscpy(cap->bus_info, dev_name(&cdev->gadget->dev),
                sizeof(cap->bus_info));
        return 0;
 }

diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 61cabb9de6ae1b5b5638ef3684eb7cdc138c7d98..b0567c63d754555a67c1584e7f3e343abf254202 100644 (file)
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2558,7 +2558,7 @@ omap_ep_setup(char *name, u8 addr, u8 type,
 
        /* set up driver data structures */
        BUG_ON(strlen(name) >= sizeof ep->name);
-       strlcpy(ep->name, name, sizeof ep->name);
+       strscpy(ep->name, name, sizeof(ep->name));
        INIT_LIST_HEAD(&ep->queue);
        INIT_LIST_HEAD(&ep->iso);
        ep->bEndpointAddress = addr;

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 04c4e3fed09460968c4e9af6ccb283b19a37bbaa..87035ac0983487de3a0e4d3630fe34142915ecd8 100644 (file)
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -547,7 +547,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                hub->boost_up = USB251XB_DEF_BOOST_UP;
 
        cproperty_char = of_get_property(np, "manufacturer", NULL);
-       strlcpy(str, cproperty_char ? : USB251XB_DEF_MANUFACTURER_STRING,
+       strscpy(str, cproperty_char ? : USB251XB_DEF_MANUFACTURER_STRING,
                sizeof(str));
        hub->manufacturer_len = strlen(str) & 0xFF;
        memset(hub->manufacturer, 0, USB251XB_STRING_BUFSIZE);
@@ -557,7 +557,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                              USB251XB_STRING_BUFSIZE);
 
        cproperty_char = of_get_property(np, "product", NULL);
-       strlcpy(str, cproperty_char ? : data->product_str, sizeof(str));
+       strscpy(str, cproperty_char ? : data->product_str, sizeof(str));
        hub->product_len = strlen(str) & 0xFF;
        memset(hub->product, 0, USB251XB_STRING_BUFSIZE);
        len = min_t(size_t, USB251XB_STRING_BUFSIZE / 2, strlen(str));
@@ -566,7 +566,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                              USB251XB_STRING_BUFSIZE);
 
        cproperty_char = of_get_property(np, "serial", NULL);
-       strlcpy(str, cproperty_char ? : USB251XB_DEF_SERIAL_STRING,
+       strscpy(str, cproperty_char ? : USB251XB_DEF_SERIAL_STRING,
                sizeof(str));
        hub->serial_len = strlen(str) & 0xFF;
        memset(hub->serial, 0, USB251XB_STRING_BUFSIZE);

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 1db2eefeea22f0bb3528dc413dbf76c97989414a..01f3c2779ccf3e76df5ba41c0ca2f0ee8a40e7f8 100644 (file)
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -201,7 +201,7 @@ static int onetouch_connect_input(struct us_data *ss)
        onetouch->dev = input_dev;
 
        if (udev->manufacturer)
-               strlcpy(onetouch->name, udev->manufacturer,
+               strscpy(onetouch->name, udev->manufacturer,
                        sizeof(onetouch->name));
        if (udev->product) {
                if (udev->manufacturer)

diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
index 96c55eaf3f808de4ccac0e84192a426ec2273d33..ab89c014606ef5351a3c5f5f74c1dc35ac380db9 100644 (file)
--- a/drivers/usb/typec/tcpm/fusb302.c
+++ b/drivers/usb/typec/tcpm/fusb302.c
@@ -151,7 +151,7 @@ static void _fusb302_log(struct fusb302_chip *chip, const char *fmt,
 
        if (fusb302_log_full(chip)) {
                chip->logbuffer_head = max(chip->logbuffer_head - 1, 0);
-               strlcpy(tmpbuffer, "overflow", sizeof(tmpbuffer));
+               strscpy(tmpbuffer, "overflow", sizeof(tmpbuffer));
        }
 
        if (chip->logbuffer_head < 0 ||

diff --git a/drivers/usb/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c
index 77a5b3f8736af1e760a807894da0f5b2a0c9cbbb..e8c3131a85431082e035f378d2a84d763e1b9a72 100644 (file)
--- a/drivers/usb/usbip/stub_main.c
+++ b/drivers/usb/usbip/stub_main.c
@@ -100,7 +100,7 @@ static int add_match_busid(char *busid)
        for (i = 0; i < MAX_BUSID; i++) {
                spin_lock(&busid_table[i].busid_lock);
                if (!busid_table[i].name[0]) {
-                       strlcpy(busid_table[i].name, busid, BUSID_SIZE);
+                       strscpy(busid_table[i].name, busid, BUSID_SIZE);
                        if ((busid_table[i].status != STUB_BUSID_ALLOC) &&
                            (busid_table[i].status != STUB_BUSID_REMOV))
                                busid_table[i].status = STUB_BUSID_ADDED;