From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f66.google.com (mail-dl1-f66.google.com [74.125.82.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0D4381724 for ; Mon, 26 Jan 2026 03:52:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769399527; cv=none; b=logIr1ehhfOlp5Hyeee8JEIRtdEf4G4C+3zaVlnHGe2e74g5VwmpCr9VOjcJQ02PND+jwEs1B1+7xNgD/tmOkE1g/YmNnoIS9CllJZHWB4lEarHbob01jGIocBH7U5Mmrb8Oh2un3g7308ZGWCuhuwf0+q6oIN5byezeOpxWzi0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769399527; c=relaxed/simple; bh=crXu8pNugPi6rfhLeI9b0Q0hjuUojYgkupq319fBZWM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dGaytS4wr63jFB8Xmf2/HwzaXynTyHnCq6Mk9XQqBy8ZYlIGFeaLH5S3+yGdJ9/nWo+w+dSmmtYKu+3XjdPSlA8iyUT9xQCY3zsuTw+TuWyUBe+r3UWGCt4RKpvnGtUNsMvPjeACkctt0DpgoFXxAGBY/IrIztF+Z5GbhUMVNvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lZXJISlV; arc=none smtp.client-ip=74.125.82.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lZXJISlV" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-1233702afd3so5518085c88.0 for ; Sun, 25 Jan 2026 19:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769399525; x=1770004325; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=caeWPoflpwgw9gZh9BqEw370JT4+JO+63LYKAcE0IoE=; b=lZXJISlV9ZZS8PxXeEIVqS/0UmHYTW5W788Sx2K83onlqFoG33TP4k3jGJg74mvxDW rAjFfxjlSBV7I5J60kv9JrYexrnetmQyaAGpgtHNVc7JJRn7edwyhTvjElMMPVivLVtN MGnBgIUstBK42iMBYgyRUJXo+ChKYL+q1xbbXrPih5CS1Zow6+GOqVZBceBZcWpnHRdl 6HGLUfkJgKoTdKMhismPx448tcZelzFS2gjBsgFaRFRP3aNf97QLWnHXsYjZVs7pJ7/D Dea2JZzOSh9owsX+ohySOH8Swt19390HsXZH3wRo8fuyhPClLjYBerTKjpw41xLQ7hQu ZTlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769399525; x=1770004325; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=caeWPoflpwgw9gZh9BqEw370JT4+JO+63LYKAcE0IoE=; b=LOm9Pf+qBImZiASxtsRKV7oVPuerSGk3vvK6V5v5dLfeUJUjmxcHRIDKAGVtD51Hst JjuRPsileFuKM1944Nw4CM08yJPhW5cHHJfIPnFP8zQw/bDAs01Qg1s4W4PymzvCGpNR rXX5JIa35hOMaj/Rp6vvBjd0TWmzguBirs++oG5CMaA9BG9pKq3zqHg8unJz1Hg2SP8m rEZfqT46I3iRgZJFN4DtO8Fuq055JfEiX6/n0xQv+h9OTXDlnwBLLD1joEkImfh5kPe3 jX+NhSRJmIyiv+CvTiip/pcbURoKGgVyq+bxdZ49NjCrJse3rHuC+pqDJrW07i2HIEkT 6sKw== X-Gm-Message-State: AOJu0YwzDi7SaJt3aJY99WPhaxRsYtcCsba6vQ3XHmapMWF76UOv3/86 EO7bwKdPMuq8agn166L2tQWTebP/DSC/UVSyOWPWFRaJa4Ld/CHkdAhmaAVJ4lSH X-Gm-Gg: AZuq6aIWJTKX8ALO8SnvJcXxw/faECrHghyEJ6otsBDA8N1R29pVfbJEG+glBHI41/l 3Lz3WkgivJAqd178QBRjZLOVeyNf3p6UMoslGWz2E7jxU6GyMr1v8DQQhoFIZVF1BFI/n2xVEKg uceEwVNpA8MiNvzC9Y5mZpP7Nhd8iYqBEdjhQUAXBmUJmzZQepz4Nt+JYOgeuPrV16hhEiy5W9D H/Ca46+xpT6yu6PnxXldhqSU5YQ/HiO9iq09wOf8ezCvTkindfR3htVBnynOVu/eYgdp0JwRq14 TkNyhqk7TMbu4SlJNxd7EYy71p7UmRoKP5n5KAyeCMQB/Z18b52UoFkiKNywNdGoMPQXrQbviXs OTx0cH77OWI9aKjodMVn7krQCtCQiQ31i4dvy2BidOW1ATloMdM1qWOMP/oHNoNg9vBWTnFyMsg a+X5riuVAFQ4kAJ+0b1AAhzQ9IyxHPJUkZDEIVDmrGbrkDaK7SaXaHWRW6G1cA/BZUTel9VC/Je Y/hs63dXULpKxVLHMNTdCodMN40F1lYEuBq1adRXfYbyI5fZvddOiVm4RCvWrXYY3lsm6IY8Jj5 3R3I6WMI X-Received: by 2002:a05:7022:2389:b0:11e:528:4185 with SMTP id a92af1059eb24-1248ec8d84cmr1896642c88.38.1769399524773; Sun, 25 Jan 2026 19:52:04 -0800 (PST) Received: from ethan-latitude5420.. (host-127-22.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.22]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1247d997f7bsm17422718c88.11.2026.01.25.19.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 19:52:04 -0800 (PST) From: Ethan Nelson-Moore To: netdev@vger.kernel.org, linux-usb@vger.kernel.org Cc: Ethan Nelson-Moore , Andy Shevchenko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Thangaraj Samynathan , Rengarajan Sundararajan , UNGLinuxDriver@microchip.com, Petko Manolov , Oliver Neukum , Nikita Zhandarovich , =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= , Deepanshu Kartikey , Thomas Gleixner , Ingo Molnar , Foster Snowhill , "Gustavo A. R. Silva" , Kees Cook , Eric Biggers Subject: [PATCH net-next] net: usb: switch to two-argument strscpy Date: Sun, 25 Jan 2026 19:50:15 -0800 Message-ID: <20260126035052.31216-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit All instances of strscpy in the USB network drivers use the size of the destination. If given only two arguments, strscpy will automatically use the size of the destination. Make the code more concise by switching to the two-argument form of strscpy. Also add a blank line after a variable declaration in catc.c to adhere to kernel code style, since the surrounding code is being touched. Suggested-by: Andy Shevchenko Signed-off-by: Ethan Nelson-Moore --- drivers/net/usb/aqc111.c | 2 +- drivers/net/usb/asix_common.c | 4 ++-- drivers/net/usb/catc.c | 5 +++-- drivers/net/usb/ipheth.c | 2 +- drivers/net/usb/lan78xx.c | 2 +- drivers/net/usb/pegasus.c | 2 +- drivers/net/usb/r8152.c | 9 ++++----- drivers/net/usb/rtl8150.c | 4 ++-- drivers/net/usb/sierra_net.c | 4 ++-- drivers/net/usb/sr9800.c | 4 ++-- drivers/net/usb/usbnet.c | 13 ++++++------- 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 9201ee10a13f..71394cf2f450 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -207,7 +207,7 @@ static void aqc111_get_drvinfo(struct net_device *net, /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); + strscpy(info->driver, DRIVER_NAME); snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u", aqc111_data->fw_ver.major, aqc111_data->fw_ver.minor, diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c index 6ab3486072cb..48a09be6801e 100644 --- a/drivers/net/usb/asix_common.c +++ b/drivers/net/usb/asix_common.c @@ -735,8 +735,8 @@ void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) { /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + strscpy(info->driver, DRIVER_NAME); + strscpy(info->version, DRIVER_VERSION); } int asix_set_mac_address(struct net_device *net, void *p) diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 6759388692f8..05a5bd632582 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c @@ -672,8 +672,9 @@ static void catc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct catc *catc = netdev_priv(dev); - strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + + strscpy(info->driver, driver_name); + strscpy(info->version, DRIVER_VERSION); usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index a19789b57190..a2d45aff93b6 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -586,7 +586,7 @@ static int ipheth_probe(struct usb_interface *intf, netdev->netdev_ops = &ipheth_netdev_ops; netdev->watchdog_timeo = IPHETH_TX_TIMEOUT; - strscpy(netdev->name, "eth%d", sizeof(netdev->name)); + strscpy(netdev->name, "eth%d"); dev = netdev_priv(netdev); dev->udev = udev; diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 00397a807393..2f31ebf25732 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1811,7 +1811,7 @@ static void lan78xx_get_drvinfo(struct net_device *net, { struct lan78xx_net *dev = netdev_priv(net); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); + strscpy(info->driver, DRIVER_NAME); usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index c514483134f0..dfcf42bdbf5f 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -896,7 +896,7 @@ static void pegasus_get_drvinfo(struct net_device *dev, { pegasus_t *pegasus = netdev_priv(dev); - strscpy(info->driver, driver_name, sizeof(info->driver)); + strscpy(info->driver, driver_name); usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 880b59ed5422..ef13b7663890 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5256,7 +5256,7 @@ static void rtl8152_apply_firmware(struct r8152 *tp, bool power_cut) rtl_fw->post_fw(tp); rtl_reset_ocp_base(tp); - strscpy(rtl_fw->version, fw_hdr->version, RTL_VER_SIZE); + strscpy(rtl_fw->version, fw_hdr->version); dev_dbg(&tp->intf->dev, "load %s successfully\n", rtl_fw->version); } @@ -8755,12 +8755,11 @@ static void rtl8152_get_drvinfo(struct net_device *netdev, { struct r8152 *tp = netdev_priv(netdev); - strscpy(info->driver, MODULENAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + strscpy(info->driver, MODULENAME); + strscpy(info->version, DRIVER_VERSION); usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info)); if (!IS_ERR_OR_NULL(tp->rtl_fw.fw)) - strscpy(info->fw_version, tp->rtl_fw.version, - sizeof(info->fw_version)); + strscpy(info->fw_version, tp->rtl_fw.version); } static diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index e40b0669d9f4..04b16181d992 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -784,8 +784,8 @@ static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinf { rtl8150_t *dev = netdev_priv(netdev); - strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + strscpy(info->driver, driver_name); + strscpy(info->version, DRIVER_VERSION); usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); } diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index 36c73db44f77..d8f5d8ac697c 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -612,8 +612,8 @@ static void sierra_net_get_drvinfo(struct net_device *net, { /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - strscpy(info->driver, driver_name, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + strscpy(info->driver, driver_name); + strscpy(info->version, DRIVER_VERSION); } static u32 sierra_net_get_link(struct net_device *net) diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index 57947a5590cc..84fe53d1a721 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -474,8 +474,8 @@ static void sr_get_drvinfo(struct net_device *net, { /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); - strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); + strscpy(info->driver, DRIVER_NAME); + strscpy(info->version, DRIVER_VERSION); } static u32 sr_get_link(struct net_device *net) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 9280ef544bbb..c5ab449469c4 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1089,9 +1089,8 @@ void usbnet_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) { struct usbnet *dev = netdev_priv(net); - strscpy(info->driver, dev->driver_name, sizeof(info->driver)); - strscpy(info->fw_version, dev->driver_info->description, - sizeof(info->fw_version)); + strscpy(info->driver, dev->driver_name); + strscpy(info->fw_version, dev->driver_info->description); usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); } EXPORT_SYMBOL_GPL(usbnet_get_drvinfo); @@ -1783,7 +1782,7 @@ usbnet_probe(struct usb_interface *udev, const struct usb_device_id *prod) dev->interrupt_count = 0; dev->net = net; - strscpy(net->name, "usb%d", sizeof(net->name)); + strscpy(net->name, "usb%d"); /* rx and tx sides can use different message sizes; * bind() should set rx_urb_size in that case. @@ -1809,13 +1808,13 @@ usbnet_probe(struct usb_interface *udev, const struct usb_device_id *prod) */ if ((dev->driver_info->flags & FLAG_ETHER) != 0 && !usbnet_needs_usb_name_format(dev, net)) - strscpy(net->name, "eth%d", sizeof(net->name)); + strscpy(net->name, "eth%d"); /* WLAN devices should always be named "wlan%d" */ if ((dev->driver_info->flags & FLAG_WLAN) != 0) - strscpy(net->name, "wlan%d", sizeof(net->name)); + strscpy(net->name, "wlan%d"); /* WWAN devices should always be named "wwan%d" */ if ((dev->driver_info->flags & FLAG_WWAN) != 0) - strscpy(net->name, "wwan%d", sizeof(net->name)); + strscpy(net->name, "wwan%d"); /* devices that cannot do ARP */ if ((dev->driver_info->flags & FLAG_NOARP) != 0) -- 2.43.0