Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wifi: 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/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220830201457.7984-2-wsa+renesas@sang-engineering.com

authored by

Wolfram Sang and committed by
Kalle Valo
bf99f11d 1dc13236

+36 -36
+1 -1
drivers/net/wireless/ath/ath6kl/init.c
··· 1014 1014 1015 1015 switch (ie_id) { 1016 1016 case ATH6KL_FW_IE_FW_VERSION: 1017 - strlcpy(ar->wiphy->fw_version, data, 1017 + strscpy(ar->wiphy->fw_version, data, 1018 1018 min(sizeof(ar->wiphy->fw_version), ie_len+1)); 1019 1019 1020 1020 ath6kl_dbg(ATH6KL_DBG_BOOT,
+1 -1
drivers/net/wireless/ath/carl9170/fw.c
··· 105 105 CARL9170FW_GET_MONTH(fw_date), 106 106 CARL9170FW_GET_DAY(fw_date)); 107 107 108 - strlcpy(ar->hw->wiphy->fw_version, motd_desc->release, 108 + strscpy(ar->hw->wiphy->fw_version, motd_desc->release, 109 109 sizeof(ar->hw->wiphy->fw_version)); 110 110 } 111 111 }
+1 -1
drivers/net/wireless/ath/wil6210/main.c
··· 1305 1305 board_file = WIL_BOARD_FILE_NAME; 1306 1306 } 1307 1307 1308 - strlcpy(buf, board_file, len); 1308 + strscpy(buf, board_file, len); 1309 1309 } 1310 1310 1311 1311 static int wil_get_bl_info(struct wil6210_priv *wil)
+1 -1
drivers/net/wireless/ath/wil6210/netdev.c
··· 445 445 446 446 wil_dbg_misc(wil, "entered"); 447 447 448 - strlcpy(wiphy->fw_version, wil->fw_version, sizeof(wiphy->fw_version)); 448 + strscpy(wiphy->fw_version, wil->fw_version, sizeof(wiphy->fw_version)); 449 449 450 450 rc = wiphy_register(wiphy); 451 451 if (rc < 0) {
+1 -1
drivers/net/wireless/ath/wil6210/wmi.c
··· 780 780 return; /* FW load will fail after timeout */ 781 781 } 782 782 /* ignore MAC address, we already have it from the boot loader */ 783 - strlcpy(wiphy->fw_version, wil->fw_version, sizeof(wiphy->fw_version)); 783 + strscpy(wiphy->fw_version, wil->fw_version, sizeof(wiphy->fw_version)); 784 784 785 785 if (len > offsetof(struct wmi_ready_event, rfc_read_calib_result)) { 786 786 wil_dbg_wmi(wil, "rfc calibration result %d\n",
+1 -1
drivers/net/wireless/atmel/atmel.c
··· 1518 1518 priv->firmware = NULL; 1519 1519 priv->firmware_type = fw_type; 1520 1520 if (firmware) /* module parameter */ 1521 - strlcpy(priv->firmware_id, firmware, sizeof(priv->firmware_id)); 1521 + strscpy(priv->firmware_id, firmware, sizeof(priv->firmware_id)); 1522 1522 priv->bus_type = card_present ? BUS_TYPE_PCCARD : BUS_TYPE_PCI; 1523 1523 priv->station_state = STATION_STATE_DOWN; 1524 1524 priv->do_rx_crc = 0;
+1 -1
drivers/net/wireless/broadcom/b43/leds.c
··· 118 118 led->wl = dev->wl; 119 119 led->index = led_index; 120 120 led->activelow = activelow; 121 - strlcpy(led->name, name, sizeof(led->name)); 121 + strscpy(led->name, name, sizeof(led->name)); 122 122 atomic_set(&led->state, 0); 123 123 124 124 led->led_dev.name = led->name;
+1 -1
drivers/net/wireless/broadcom/b43legacy/leds.c
··· 88 88 led->dev = dev; 89 89 led->index = led_index; 90 90 led->activelow = activelow; 91 - strlcpy(led->name, name, sizeof(led->name)); 91 + strscpy(led->name, name, sizeof(led->name)); 92 92 93 93 led->led_dev.name = led->name; 94 94 led->led_dev.default_trigger = default_trigger;
+4 -4
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
··· 261 261 &revinfo, sizeof(revinfo)); 262 262 if (err < 0) { 263 263 bphy_err(drvr, "retrieving revision info failed, %d\n", err); 264 - strlcpy(ri->chipname, "UNKNOWN", sizeof(ri->chipname)); 264 + strscpy(ri->chipname, "UNKNOWN", sizeof(ri->chipname)); 265 265 } else { 266 266 ri->vendorid = le32_to_cpu(revinfo.vendorid); 267 267 ri->deviceid = le32_to_cpu(revinfo.deviceid); ··· 314 314 315 315 /* locate firmware version number for ethtool */ 316 316 ptr = strrchr(buf, ' ') + 1; 317 - strlcpy(ifp->drvr->fwver, ptr, sizeof(ifp->drvr->fwver)); 317 + strscpy(ifp->drvr->fwver, ptr, sizeof(ifp->drvr->fwver)); 318 318 319 319 /* Query for 'clmver' to get CLM version info from firmware */ 320 320 memset(buf, 0, sizeof(buf)); ··· 424 424 * if not set then if available use the platform data version. To make 425 425 * sure it gets initialized at all, always copy the module param version 426 426 */ 427 - strlcpy(brcmf_mp_global.firmware_path, brcmf_firmware_path, 427 + strscpy(brcmf_mp_global.firmware_path, brcmf_firmware_path, 428 428 BRCMF_FW_ALTPATH_LEN); 429 429 if ((brcmfmac_pdata) && (brcmfmac_pdata->fw_alternative_path) && 430 430 (brcmf_mp_global.firmware_path[0] == '\0')) { 431 - strlcpy(brcmf_mp_global.firmware_path, 431 + strscpy(brcmf_mp_global.firmware_path, 432 432 brcmfmac_pdata->fw_alternative_path, 433 433 BRCMF_FW_ALTPATH_LEN); 434 434 }
+4 -4
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
··· 561 561 562 562 if (drvr->revinfo.result == 0) 563 563 brcmu_dotrev_str(drvr->revinfo.driverrev, drev); 564 - strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 565 - strlcpy(info->version, drev, sizeof(info->version)); 566 - strlcpy(info->fw_version, drvr->fwver, sizeof(info->fw_version)); 567 - strlcpy(info->bus_info, dev_name(drvr->bus_if->dev), 564 + strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 565 + strscpy(info->version, drev, sizeof(info->version)); 566 + strscpy(info->fw_version, drvr->fwver, sizeof(info->fw_version)); 567 + strscpy(info->bus_info, dev_name(drvr->bus_if->dev), 568 568 sizeof(info->bus_info)); 569 569 } 570 570
+1 -1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
··· 769 769 fwnames[j].path[0] = '\0'; 770 770 /* check if firmware path is provided by module parameter */ 771 771 if (brcmf_mp_global.firmware_path[0] != '\0') { 772 - strlcpy(fwnames[j].path, mp_path, 772 + strscpy(fwnames[j].path, mp_path, 773 773 BRCMF_FW_NAME_LEN); 774 774 775 775 if (end != '/') {
+1 -1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
··· 688 688 struct brcmf_fws_mac_descriptor *desc) 689 689 { 690 690 if (desc == &fws->desc.other) 691 - strlcpy(desc->name, "MAC-OTHER", sizeof(desc->name)); 691 + strscpy(desc->name, "MAC-OTHER", sizeof(desc->name)); 692 692 else if (desc->mac_handle) 693 693 scnprintf(desc->name, sizeof(desc->name), "MAC-%d:%d", 694 694 desc->mac_handle, desc->interface_id);
+3 -3
drivers/net/wireless/intel/ipw2x00/ipw2100.c
··· 5907 5907 struct ipw2100_priv *priv = libipw_priv(dev); 5908 5908 char fw_ver[64], ucode_ver[64]; 5909 5909 5910 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 5911 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 5910 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 5911 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 5912 5912 5913 5913 ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver)); 5914 5914 ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver)); ··· 5916 5916 snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s", 5917 5917 fw_ver, priv->eeprom_version, ucode_ver); 5918 5918 5919 - strlcpy(info->bus_info, pci_name(priv->pci_dev), 5919 + strscpy(info->bus_info, pci_name(priv->pci_dev), 5920 5920 sizeof(info->bus_info)); 5921 5921 } 5922 5922
+3 -3
drivers/net/wireless/intel/ipw2x00/ipw2200.c
··· 10424 10424 char date[32]; 10425 10425 u32 len; 10426 10426 10427 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 10428 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 10427 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 10428 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 10429 10429 10430 10430 len = sizeof(vers); 10431 10431 ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &len); ··· 10434 10434 10435 10435 snprintf(info->fw_version, sizeof(info->fw_version), "%s (%s)", 10436 10436 vers, date); 10437 - strlcpy(info->bus_info, pci_name(p->pci_dev), 10437 + strscpy(info->bus_info, pci_name(p->pci_dev), 10438 10438 sizeof(info->bus_info)); 10439 10439 } 10440 10440
+1 -1
drivers/net/wireless/intel/iwlegacy/3945-mac.c
··· 3254 3254 3255 3255 if (count) { 3256 3256 char *p = buffer; 3257 - strlcpy(buffer, buf, sizeof(buffer)); 3257 + strscpy(buffer, buf, sizeof(buffer)); 3258 3258 channel = simple_strtoul(p, NULL, 0); 3259 3259 if (channel) 3260 3260 params.channel = channel;
+1 -1
drivers/net/wireless/intersil/hostap/hostap_ioctl.c
··· 3848 3848 iface = netdev_priv(dev); 3849 3849 local = iface->local; 3850 3850 3851 - strlcpy(info->driver, "hostap", sizeof(info->driver)); 3851 + strscpy(info->driver, "hostap", sizeof(info->driver)); 3852 3852 snprintf(info->fw_version, sizeof(info->fw_version), 3853 3853 "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff, 3854 3854 (local->sta_fw_ver >> 8) & 0xff,
+2 -2
drivers/net/wireless/marvell/libertas/ethtool.c
··· 20 20 priv->fwrelease >> 16 & 0xff, 21 21 priv->fwrelease >> 8 & 0xff, 22 22 priv->fwrelease & 0xff); 23 - strlcpy(info->driver, "libertas", sizeof(info->driver)); 24 - strlcpy(info->version, lbs_driver_version, sizeof(info->version)); 23 + strscpy(info->driver, "libertas", sizeof(info->driver)); 24 + strscpy(info->version, lbs_driver_version, sizeof(info->version)); 25 25 } 26 26 27 27 /*
+1 -1
drivers/net/wireless/microchip/wilc1000/mon.c
··· 229 229 return NULL; 230 230 231 231 wl->monitor_dev->type = ARPHRD_IEEE80211_RADIOTAP; 232 - strlcpy(wl->monitor_dev->name, name, IFNAMSIZ); 232 + strscpy(wl->monitor_dev->name, name, IFNAMSIZ); 233 233 wl->monitor_dev->netdev_ops = &wilc_wfi_netdev_ops; 234 234 wl->monitor_dev->needs_free_netdev = true; 235 235
+1 -1
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
··· 1223 1223 mac->macinfo.extended_capabilities_len; 1224 1224 } 1225 1225 1226 - strlcpy(wiphy->fw_version, hw_info->fw_version, 1226 + strscpy(wiphy->fw_version, hw_info->fw_version, 1227 1227 sizeof(wiphy->fw_version)); 1228 1228 wiphy->hw_version = hw_info->hw_version; 1229 1229
+1 -1
drivers/net/wireless/quantenna/qtnfmac/commands.c
··· 967 967 hwinfo->total_rx_chain, hwinfo->total_tx_chain, 968 968 hwinfo->fw_ver); 969 969 970 - strlcpy(hwinfo->fw_version, bld_label, sizeof(hwinfo->fw_version)); 970 + strscpy(hwinfo->fw_version, bld_label, sizeof(hwinfo->fw_version)); 971 971 hwinfo->hw_version = hw_ver; 972 972 973 973 return 0;
+1 -1
drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c
··· 143 143 led->dev = dev; 144 144 led->ledpin = ledpin; 145 145 led->is_radio = is_radio; 146 - strlcpy(led->name, name, sizeof(led->name)); 146 + strscpy(led->name, name, sizeof(led->name)); 147 147 148 148 led->led_dev.name = led->name; 149 149 led->led_dev.default_trigger = default_trigger;
+4 -4
drivers/net/wireless/wl3501_cs.c
··· 1441 1441 static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info, 1442 1442 union iwreq_data *wrqu, char *extra) 1443 1443 { 1444 - strlcpy(wrqu->name, "IEEE 802.11-DS", sizeof(wrqu->name)); 1444 + strscpy(wrqu->name, "IEEE 802.11-DS", sizeof(wrqu->name)); 1445 1445 return 0; 1446 1446 } 1447 1447 ··· 1652 1652 1653 1653 if (wrqu->data.length > sizeof(this->nick)) 1654 1654 return -E2BIG; 1655 - strlcpy(this->nick, extra, wrqu->data.length); 1655 + strscpy(this->nick, extra, wrqu->data.length); 1656 1656 return 0; 1657 1657 } 1658 1658 ··· 1661 1661 { 1662 1662 struct wl3501_card *this = netdev_priv(dev); 1663 1663 1664 - strlcpy(extra, this->nick, 32); 1664 + strscpy(extra, this->nick, 32); 1665 1665 wrqu->data.length = strlen(extra); 1666 1666 return 0; 1667 1667 } ··· 1965 1965 this->firmware_date[0] = '\0'; 1966 1966 this->rssi = 255; 1967 1967 this->chan = iw_default_channel(this->reg_domain); 1968 - strlcpy(this->nick, "Planet WL3501", sizeof(this->nick)); 1968 + strscpy(this->nick, "Planet WL3501", sizeof(this->nick)); 1969 1969 spin_lock_init(&this->lock); 1970 1970 init_waitqueue_head(&this->wait); 1971 1971 netif_start_queue(dev);