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

net: 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>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for CAN
Link: https://lore.kernel.org/r/20220830201457.7984-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Wolfram Sang and committed by
Jakub Kicinski fb3ceec1 8af1a9af

+75 -75
+1 -1
drivers/net/Space.c
··· 68 68 for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { 69 69 if (s[i].name[0] == '\0' || s[i].name[0] == ' ') { 70 70 memset(s[i].name, 0, sizeof(s[i].name)); 71 - strlcpy(s[i].name, name, IFNAMSIZ); 71 + strscpy(s[i].name, name, IFNAMSIZ); 72 72 memcpy(&s[i].map, map, sizeof(s[i].map)); 73 73 break; 74 74 }
+1 -1
drivers/net/bonding/bond_main.c
··· 5619 5619 static void bond_ethtool_get_drvinfo(struct net_device *bond_dev, 5620 5620 struct ethtool_drvinfo *drvinfo) 5621 5621 { 5622 - strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); 5622 + strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); 5623 5623 snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d", 5624 5624 BOND_ABI_VERSION); 5625 5625 }
+1 -1
drivers/net/can/sja1000/peak_pcmcia.c
··· 478 478 if (!netdev) 479 479 continue; 480 480 481 - strlcpy(name, netdev->name, IFNAMSIZ); 481 + strscpy(name, netdev->name, IFNAMSIZ); 482 482 483 483 unregister_sja1000dev(netdev); 484 484
+1 -1
drivers/net/can/usb/peak_usb/pcan_usb_core.c
··· 962 962 963 963 dev_prev_siblings = dev->prev_siblings; 964 964 dev->state &= ~PCAN_USB_STATE_CONNECTED; 965 - strlcpy(name, netdev->name, IFNAMSIZ); 965 + strscpy(name, netdev->name, IFNAMSIZ); 966 966 967 967 unregister_netdev(netdev); 968 968
+1 -1
drivers/net/dsa/b53/b53_common.c
··· 972 972 973 973 if (stringset == ETH_SS_STATS) { 974 974 for (i = 0; i < mib_size; i++) 975 - strlcpy(data + i * ETH_GSTRING_LEN, 975 + strscpy(data + i * ETH_GSTRING_LEN, 976 976 mibs[i].name, ETH_GSTRING_LEN); 977 977 } else if (stringset == ETH_SS_PHY_STATS) { 978 978 phydev = b53_get_phy_device(ds, port);
+1 -1
drivers/net/dsa/bcm_sf2_cfp.c
··· 1296 1296 "CFP%03d_%sCntr", 1297 1297 i, bcm_sf2_cfp_stats[j].name); 1298 1298 iter = (i - 1) * s + j; 1299 - strlcpy(data + iter * ETH_GSTRING_LEN, 1299 + strscpy(data + iter * ETH_GSTRING_LEN, 1300 1300 buf, ETH_GSTRING_LEN); 1301 1301 } 1302 1302 }
+1 -1
drivers/net/dsa/hirschmann/hellcreek.c
··· 288 288 for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) { 289 289 const struct hellcreek_counter *counter = &hellcreek_counter[i]; 290 290 291 - strlcpy(data + i * ETH_GSTRING_LEN, 291 + strscpy(data + i * ETH_GSTRING_LEN, 292 292 counter->name, ETH_GSTRING_LEN); 293 293 } 294 294 }
+1 -1
drivers/net/dsa/mv88e6xxx/chip.c
··· 1136 1136 unsigned int i; 1137 1137 1138 1138 for (i = 0; i < ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++) 1139 - strlcpy(data + i * ETH_GSTRING_LEN, 1139 + strscpy(data + i * ETH_GSTRING_LEN, 1140 1140 mv88e6xxx_atu_vtu_stats_strings[i], 1141 1141 ETH_GSTRING_LEN); 1142 1142 }
+1 -1
drivers/net/dummy.c
··· 102 102 static void dummy_get_drvinfo(struct net_device *dev, 103 103 struct ethtool_drvinfo *info) 104 104 { 105 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 105 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 106 106 } 107 107 108 108 static const struct ethtool_ops dummy_ethtool_ops = {
+3 -3
drivers/net/fjes/fjes_ethtool.c
··· 151 151 152 152 plat_dev = adapter->plat_dev; 153 153 154 - strlcpy(drvinfo->driver, fjes_driver_name, sizeof(drvinfo->driver)); 155 - strlcpy(drvinfo->version, fjes_driver_version, 154 + strscpy(drvinfo->driver, fjes_driver_name, sizeof(drvinfo->driver)); 155 + strscpy(drvinfo->version, fjes_driver_version, 156 156 sizeof(drvinfo->version)); 157 157 158 - strlcpy(drvinfo->fw_version, "none", sizeof(drvinfo->fw_version)); 158 + strscpy(drvinfo->fw_version, "none", sizeof(drvinfo->fw_version)); 159 159 snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info), 160 160 "platform:%s", plat_dev->name); 161 161 }
+2 -2
drivers/net/geneve.c
··· 1197 1197 static void geneve_get_drvinfo(struct net_device *dev, 1198 1198 struct ethtool_drvinfo *drvinfo) 1199 1199 { 1200 - strlcpy(drvinfo->version, GENEVE_NETDEV_VER, sizeof(drvinfo->version)); 1201 - strlcpy(drvinfo->driver, "geneve", sizeof(drvinfo->driver)); 1200 + strscpy(drvinfo->version, GENEVE_NETDEV_VER, sizeof(drvinfo->version)); 1201 + strscpy(drvinfo->driver, "geneve", sizeof(drvinfo->driver)); 1202 1202 } 1203 1203 1204 1204 static const struct ethtool_ops geneve_ethtool_ops = {
+1 -1
drivers/net/hamradio/hdlcdrv.c
··· 600 600 601 601 case HDLCDRVCTL_DRIVERNAME: 602 602 if (s->ops && s->ops->drvname) { 603 - strlcpy(bi.data.drivername, s->ops->drvname, 603 + strscpy(bi.data.drivername, s->ops->drvname, 604 604 sizeof(bi.data.drivername)); 605 605 break; 606 606 }
+2 -2
drivers/net/hyperv/netvsc_drv.c
··· 935 935 static void netvsc_get_drvinfo(struct net_device *net, 936 936 struct ethtool_drvinfo *info) 937 937 { 938 - strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 939 - strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); 938 + strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 939 + strscpy(info->fw_version, "N/A", sizeof(info->fw_version)); 940 940 } 941 941 942 942 static void netvsc_get_channels(struct net_device *net,
+2 -2
drivers/net/ipvlan/ipvlan_main.c
··· 408 408 static void ipvlan_ethtool_get_drvinfo(struct net_device *dev, 409 409 struct ethtool_drvinfo *drvinfo) 410 410 { 411 - strlcpy(drvinfo->driver, IPVLAN_DRV, sizeof(drvinfo->driver)); 412 - strlcpy(drvinfo->version, IPV_DRV_VER, sizeof(drvinfo->version)); 411 + strscpy(drvinfo->driver, IPVLAN_DRV, sizeof(drvinfo->driver)); 412 + strscpy(drvinfo->version, IPV_DRV_VER, sizeof(drvinfo->version)); 413 413 } 414 414 415 415 static u32 ipvlan_ethtool_get_msglevel(struct net_device *dev)
+2 -2
drivers/net/macvlan.c
··· 1043 1043 static void macvlan_ethtool_get_drvinfo(struct net_device *dev, 1044 1044 struct ethtool_drvinfo *drvinfo) 1045 1045 { 1046 - strlcpy(drvinfo->driver, "macvlan", sizeof(drvinfo->driver)); 1047 - strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version)); 1046 + strscpy(drvinfo->driver, "macvlan", sizeof(drvinfo->driver)); 1047 + strscpy(drvinfo->version, "0.1", sizeof(drvinfo->version)); 1048 1048 } 1049 1049 1050 1050 static int macvlan_ethtool_get_link_ksettings(struct net_device *dev,
+2 -2
drivers/net/net_failover.c
··· 324 324 static void nfo_ethtool_get_drvinfo(struct net_device *dev, 325 325 struct ethtool_drvinfo *drvinfo) 326 326 { 327 - strlcpy(drvinfo->driver, FAILOVER_NAME, sizeof(drvinfo->driver)); 328 - strlcpy(drvinfo->version, FAILOVER_VERSION, sizeof(drvinfo->version)); 327 + strscpy(drvinfo->driver, FAILOVER_NAME, sizeof(drvinfo->driver)); 328 + strscpy(drvinfo->version, FAILOVER_VERSION, sizeof(drvinfo->version)); 329 329 } 330 330 331 331 static int nfo_ethtool_get_link_ksettings(struct net_device *dev,
+5 -5
drivers/net/netconsole.c
··· 55 55 #ifndef MODULE 56 56 static int __init option_setup(char *opt) 57 57 { 58 - strlcpy(config, opt, MAX_PARAM_LENGTH); 58 + strscpy(config, opt, MAX_PARAM_LENGTH); 59 59 return 1; 60 60 } 61 61 __setup("netconsole=", option_setup); ··· 178 178 goto fail; 179 179 180 180 nt->np.name = "netconsole"; 181 - strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); 181 + strscpy(nt->np.dev_name, "eth0", IFNAMSIZ); 182 182 nt->np.local_port = 6665; 183 183 nt->np.remote_port = 6666; 184 184 eth_broadcast_addr(nt->np.remote_mac); ··· 414 414 return -EINVAL; 415 415 } 416 416 417 - strlcpy(nt->np.dev_name, buf, IFNAMSIZ); 417 + strscpy(nt->np.dev_name, buf, IFNAMSIZ); 418 418 419 419 /* Get rid of possible trailing newline from echo(1) */ 420 420 len = strnlen(nt->np.dev_name, IFNAMSIZ); ··· 630 630 return ERR_PTR(-ENOMEM); 631 631 632 632 nt->np.name = "netconsole"; 633 - strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); 633 + strscpy(nt->np.dev_name, "eth0", IFNAMSIZ); 634 634 nt->np.local_port = 6665; 635 635 nt->np.remote_port = 6666; 636 636 eth_broadcast_addr(nt->np.remote_mac); ··· 708 708 if (nt->np.dev == dev) { 709 709 switch (event) { 710 710 case NETDEV_CHANGENAME: 711 - strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); 711 + strscpy(nt->np.dev_name, dev->name, IFNAMSIZ); 712 712 break; 713 713 case NETDEV_RELEASE: 714 714 case NETDEV_JOIN:
+3 -3
drivers/net/ntb_netdev.c
··· 364 364 { 365 365 struct ntb_netdev *dev = netdev_priv(ndev); 366 366 367 - strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 368 - strlcpy(info->version, NTB_NETDEV_VER, sizeof(info->version)); 369 - strlcpy(info->bus_info, pci_name(dev->pdev), sizeof(info->bus_info)); 367 + strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 368 + strscpy(info->version, NTB_NETDEV_VER, sizeof(info->version)); 369 + strscpy(info->bus_info, pci_name(dev->pdev), sizeof(info->bus_info)); 370 370 } 371 371 372 372 static int ntb_get_link_ksettings(struct net_device *dev,
+1 -1
drivers/net/phy/adin.c
··· 749 749 int i; 750 750 751 751 for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) { 752 - strlcpy(&data[i * ETH_GSTRING_LEN], 752 + strscpy(&data[i * ETH_GSTRING_LEN], 753 753 adin_hw_stats[i].string, ETH_GSTRING_LEN); 754 754 } 755 755 }
+1 -1
drivers/net/phy/bcm-phy-lib.c
··· 519 519 unsigned int i; 520 520 521 521 for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++) 522 - strlcpy(data + i * ETH_GSTRING_LEN, 522 + strscpy(data + i * ETH_GSTRING_LEN, 523 523 bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN); 524 524 } 525 525 EXPORT_SYMBOL_GPL(bcm_phy_get_strings);
+1 -1
drivers/net/phy/marvell.c
··· 1952 1952 int i; 1953 1953 1954 1954 for (i = 0; i < count; i++) { 1955 - strlcpy(data + i * ETH_GSTRING_LEN, 1955 + strscpy(data + i * ETH_GSTRING_LEN, 1956 1956 marvell_hw_stats[i].string, ETH_GSTRING_LEN); 1957 1957 } 1958 1958 }
+1 -1
drivers/net/phy/micrel.c
··· 1650 1650 int i; 1651 1651 1652 1652 for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) { 1653 - strlcpy(data + i * ETH_GSTRING_LEN, 1653 + strscpy(data + i * ETH_GSTRING_LEN, 1654 1654 kszphy_hw_stats[i].string, ETH_GSTRING_LEN); 1655 1655 } 1656 1656 }
+1 -1
drivers/net/phy/mscc/mscc_main.c
··· 136 136 return; 137 137 138 138 for (i = 0; i < priv->nstats; i++) 139 - strlcpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string, 139 + strscpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string, 140 140 ETH_GSTRING_LEN); 141 141 } 142 142
+1 -1
drivers/net/phy/phy_device.c
··· 370 370 if (!fixup) 371 371 return -ENOMEM; 372 372 373 - strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id)); 373 + strscpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id)); 374 374 fixup->phy_uid = phy_uid; 375 375 fixup->phy_uid_mask = phy_uid_mask; 376 376 fixup->run = run;
+4 -4
drivers/net/rionet.c
··· 443 443 { 444 444 struct rionet_private *rnet = netdev_priv(ndev); 445 445 446 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 447 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 448 - strlcpy(info->fw_version, "n/a", sizeof(info->fw_version)); 449 - strlcpy(info->bus_info, rnet->mport->name, sizeof(info->bus_info)); 446 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 447 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 448 + strscpy(info->fw_version, "n/a", sizeof(info->fw_version)); 449 + strscpy(info->bus_info, rnet->mport->name, sizeof(info->bus_info)); 450 450 } 451 451 452 452 static u32 rionet_get_msglevel(struct net_device *ndev)
+2 -2
drivers/net/team/team.c
··· 2070 2070 static void team_ethtool_get_drvinfo(struct net_device *dev, 2071 2071 struct ethtool_drvinfo *drvinfo) 2072 2072 { 2073 - strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); 2074 - strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version)); 2073 + strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); 2074 + strscpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version)); 2075 2075 } 2076 2076 2077 2077 static int team_ethtool_get_link_ksettings(struct net_device *dev,
+4 -4
drivers/net/tun.c
··· 3540 3540 { 3541 3541 struct tun_struct *tun = netdev_priv(dev); 3542 3542 3543 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 3544 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 3543 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 3544 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 3545 3545 3546 3546 switch (tun->flags & TUN_TYPE_MASK) { 3547 3547 case IFF_TUN: 3548 - strlcpy(info->bus_info, "tun", sizeof(info->bus_info)); 3548 + strscpy(info->bus_info, "tun", sizeof(info->bus_info)); 3549 3549 break; 3550 3550 case IFF_TAP: 3551 - strlcpy(info->bus_info, "tap", sizeof(info->bus_info)); 3551 + strscpy(info->bus_info, "tap", sizeof(info->bus_info)); 3552 3552 break; 3553 3553 } 3554 3554 }
+1 -1
drivers/net/usb/aqc111.c
··· 201 201 202 202 /* Inherit standard device info */ 203 203 usbnet_get_drvinfo(net, info); 204 - strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver)); 204 + strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); 205 205 snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u", 206 206 aqc111_data->fw_ver.major, 207 207 aqc111_data->fw_ver.minor,
+2 -2
drivers/net/usb/asix_common.c
··· 752 752 { 753 753 /* Inherit standard device info */ 754 754 usbnet_get_drvinfo(net, info); 755 - strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver)); 756 - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version)); 755 + strscpy(info->driver, DRIVER_NAME, sizeof(info->driver)); 756 + strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); 757 757 } 758 758 759 759 int asix_set_mac_address(struct net_device *net, void *p)
+2 -2
drivers/net/usb/catc.c
··· 672 672 struct ethtool_drvinfo *info) 673 673 { 674 674 struct catc *catc = netdev_priv(dev); 675 - strlcpy(info->driver, driver_name, sizeof(info->driver)); 676 - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version)); 675 + strscpy(info->driver, driver_name, sizeof(info->driver)); 676 + strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); 677 677 usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info)); 678 678 } 679 679
+1 -1
drivers/net/usb/pegasus.c
··· 894 894 { 895 895 pegasus_t *pegasus = netdev_priv(dev); 896 896 897 - strlcpy(info->driver, driver_name, sizeof(info->driver)); 897 + strscpy(info->driver, driver_name, sizeof(info->driver)); 898 898 usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info)); 899 899 } 900 900
+3 -3
drivers/net/usb/r8152.c
··· 8602 8602 { 8603 8603 struct r8152 *tp = netdev_priv(netdev); 8604 8604 8605 - strlcpy(info->driver, MODULENAME, sizeof(info->driver)); 8606 - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version)); 8605 + strscpy(info->driver, MODULENAME, sizeof(info->driver)); 8606 + strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); 8607 8607 usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info)); 8608 8608 if (!IS_ERR_OR_NULL(tp->rtl_fw.fw)) 8609 - strlcpy(info->fw_version, tp->rtl_fw.version, 8609 + strscpy(info->fw_version, tp->rtl_fw.version, 8610 8610 sizeof(info->fw_version)); 8611 8611 } 8612 8612
+2 -2
drivers/net/usb/rtl8150.c
··· 769 769 { 770 770 rtl8150_t *dev = netdev_priv(netdev); 771 771 772 - strlcpy(info->driver, driver_name, sizeof(info->driver)); 773 - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version)); 772 + strscpy(info->driver, driver_name, sizeof(info->driver)); 773 + strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); 774 774 usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); 775 775 } 776 776
+2 -2
drivers/net/usb/sierra_net.c
··· 612 612 { 613 613 /* Inherit standard device info */ 614 614 usbnet_get_drvinfo(net, info); 615 - strlcpy(info->driver, driver_name, sizeof(info->driver)); 616 - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version)); 615 + strscpy(info->driver, driver_name, sizeof(info->driver)); 616 + strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); 617 617 } 618 618 619 619 static u32 sierra_net_get_link(struct net_device *net)
+3 -3
drivers/net/usb/usbnet.c
··· 1050 1050 { 1051 1051 struct usbnet *dev = netdev_priv(net); 1052 1052 1053 - strlcpy (info->driver, dev->driver_name, sizeof info->driver); 1054 - strlcpy (info->fw_version, dev->driver_info->description, 1055 - sizeof info->fw_version); 1053 + strscpy(info->driver, dev->driver_name, sizeof(info->driver)); 1054 + strscpy(info->fw_version, dev->driver_info->description, 1055 + sizeof(info->fw_version)); 1056 1056 usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info); 1057 1057 } 1058 1058 EXPORT_SYMBOL_GPL(usbnet_get_drvinfo);
+2 -2
drivers/net/veth.c
··· 128 128 129 129 static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 130 130 { 131 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 132 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 131 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 132 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 133 133 } 134 134 135 135 static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
+3 -3
drivers/net/virtio_net.c
··· 2594 2594 struct virtnet_info *vi = netdev_priv(dev); 2595 2595 struct virtio_device *vdev = vi->vdev; 2596 2596 2597 - strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 2598 - strlcpy(info->version, VIRTNET_DRIVER_VERSION, sizeof(info->version)); 2599 - strlcpy(info->bus_info, virtio_bus_name(vdev), sizeof(info->bus_info)); 2597 + strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 2598 + strscpy(info->version, VIRTNET_DRIVER_VERSION, sizeof(info->version)); 2599 + strscpy(info->bus_info, virtio_bus_name(vdev), sizeof(info->bus_info)); 2600 2600 2601 2601 } 2602 2602
+3 -3
drivers/net/vmxnet3/vmxnet3_ethtool.c
··· 209 209 { 210 210 struct vmxnet3_adapter *adapter = netdev_priv(netdev); 211 211 212 - strlcpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver)); 212 + strscpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver)); 213 213 214 - strlcpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT, 214 + strscpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT, 215 215 sizeof(drvinfo->version)); 216 216 217 - strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 217 + strscpy(drvinfo->bus_info, pci_name(adapter->pdev), 218 218 sizeof(drvinfo->bus_info)); 219 219 } 220 220
+2 -2
drivers/net/vrf.c
··· 1541 1541 static void vrf_get_drvinfo(struct net_device *dev, 1542 1542 struct ethtool_drvinfo *info) 1543 1543 { 1544 - strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); 1545 - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); 1544 + strscpy(info->driver, DRV_NAME, sizeof(info->driver)); 1545 + strscpy(info->version, DRV_VERSION, sizeof(info->version)); 1546 1546 } 1547 1547 1548 1548 static const struct ethtool_ops vrf_ethtool_ops = {
+2 -2
drivers/net/vxlan/vxlan_core.c
··· 3310 3310 static void vxlan_get_drvinfo(struct net_device *netdev, 3311 3311 struct ethtool_drvinfo *drvinfo) 3312 3312 { 3313 - strlcpy(drvinfo->version, VXLAN_VERSION, sizeof(drvinfo->version)); 3314 - strlcpy(drvinfo->driver, "vxlan", sizeof(drvinfo->driver)); 3313 + strscpy(drvinfo->version, VXLAN_VERSION, sizeof(drvinfo->version)); 3314 + strscpy(drvinfo->driver, "vxlan", sizeof(drvinfo->driver)); 3315 3315 } 3316 3316 3317 3317 static int vxlan_get_link_ksettings(struct net_device *dev,