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

IB: 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/
Link: https://lore.kernel.org/r/20220818210018.6841-1-wsa+renesas@sang-engineering.com
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

authored by

Wolfram Sang and committed by
Leon Romanovsky
2c34bb6d dc13fbf7

+15 -15
+1 -1
drivers/infiniband/core/cma_configfs.c
··· 292 292 goto fail; 293 293 } 294 294 295 - strlcpy(cma_dev_group->name, name, sizeof(cma_dev_group->name)); 295 + strscpy(cma_dev_group->name, name, sizeof(cma_dev_group->name)); 296 296 297 297 config_group_init_type_name(&cma_dev_group->ports_group, "ports", 298 298 &cma_ports_group_type);
+2 -2
drivers/infiniband/core/device.c
··· 422 422 return ret; 423 423 } 424 424 425 - strlcpy(ibdev->name, name, IB_DEVICE_NAME_MAX); 425 + strscpy(ibdev->name, name, IB_DEVICE_NAME_MAX); 426 426 ret = rename_compat_devs(ibdev); 427 427 428 428 downgrade_write(&devices_rwsem); ··· 1217 1217 ret = -ENFILE; 1218 1218 goto out; 1219 1219 } 1220 - strlcpy(device->name, dev_name(&device->dev), IB_DEVICE_NAME_MAX); 1220 + strscpy(device->name, dev_name(&device->dev), IB_DEVICE_NAME_MAX); 1221 1221 1222 1222 ret = xa_alloc_cyclic(&devices, &device->index, device, xa_limit_31b, 1223 1223 &last_id, GFP_KERNEL);
+1 -1
drivers/infiniband/hw/bnxt_re/main.c
··· 725 725 726 726 /* ib device init */ 727 727 ibdev->node_type = RDMA_NODE_IB_CA; 728 - strlcpy(ibdev->node_desc, BNXT_RE_DESC " HCA", 728 + strscpy(ibdev->node_desc, BNXT_RE_DESC " HCA", 729 729 strlen(BNXT_RE_DESC) + 5); 730 730 ibdev->phys_port_cnt = 1; 731 731
+1 -1
drivers/infiniband/hw/hfi1/file_ops.c
··· 965 965 uctxt->userversion = uinfo->userversion; 966 966 uctxt->flags = hfi1_cap_mask; /* save current flag state */ 967 967 init_waitqueue_head(&uctxt->wait); 968 - strlcpy(uctxt->comm, current->comm, sizeof(uctxt->comm)); 968 + strscpy(uctxt->comm, current->comm, sizeof(uctxt->comm)); 969 969 memcpy(uctxt->uuid, uinfo->uuid, sizeof(uctxt->uuid)); 970 970 uctxt->jkey = generate_jkey(current_uid()); 971 971 hfi1_stats.sps_ctxts++;
+1 -1
drivers/infiniband/hw/hfi1/verbs.c
··· 1801 1801 1802 1802 ib_set_device_ops(ibdev, &hfi1_dev_ops); 1803 1803 1804 - strlcpy(ibdev->node_desc, init_utsname()->nodename, 1804 + strscpy(ibdev->node_desc, init_utsname()->nodename, 1805 1805 sizeof(ibdev->node_desc)); 1806 1806 1807 1807 /*
+1 -1
drivers/infiniband/hw/mthca/mthca_cmd.c
··· 1252 1252 1253 1253 if (be16_to_cpup(vsd + VSD_OFFSET_SIG1) == VSD_SIGNATURE_TOPSPIN && 1254 1254 be16_to_cpup(vsd + VSD_OFFSET_SIG2) == VSD_SIGNATURE_TOPSPIN) { 1255 - strlcpy(board_id, vsd + VSD_OFFSET_TS_BOARD_ID, MTHCA_BOARD_ID_LEN); 1255 + strscpy(board_id, vsd + VSD_OFFSET_TS_BOARD_ID, MTHCA_BOARD_ID_LEN); 1256 1256 } else { 1257 1257 /* 1258 1258 * The board ID is a string but the firmware byte
+1 -1
drivers/infiniband/hw/ocrdma/ocrdma_hw.c
··· 1363 1363 dev->hba_port_num = (hba_attribs->ptpnum_maxdoms_hbast_cv & 1364 1364 OCRDMA_HBA_ATTRB_PTNUM_MASK) 1365 1365 >> OCRDMA_HBA_ATTRB_PTNUM_SHIFT; 1366 - strlcpy(dev->model_number, 1366 + strscpy(dev->model_number, 1367 1367 hba_attribs->controller_model_number, 1368 1368 sizeof(dev->model_number)); 1369 1369 }
+1 -1
drivers/infiniband/hw/qib/qib_iba7322.c
··· 2124 2124 2125 2125 if (hwerrs & HWE_MASK(PowerOnBISTFailed)) { 2126 2126 isfatal = 1; 2127 - strlcpy(msg, 2127 + strscpy(msg, 2128 2128 "[Memory BIST test failed, InfiniPath hardware unusable]", 2129 2129 msgl); 2130 2130 /* ignore from now on, so disable until driver reloaded */
+2 -2
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
··· 65 65 66 66 ib_get_device_fw_str(priv->ca, drvinfo->fw_version); 67 67 68 - strlcpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent), 68 + strscpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent), 69 69 sizeof(drvinfo->bus_info)); 70 70 71 - strlcpy(drvinfo->driver, "ib_ipoib", sizeof(drvinfo->driver)); 71 + strscpy(drvinfo->driver, "ib_ipoib", sizeof(drvinfo->driver)); 72 72 } 73 73 74 74 static int ipoib_get_coalesce(struct net_device *dev,
+2 -2
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
··· 124 124 static void vnic_get_drvinfo(struct net_device *netdev, 125 125 struct ethtool_drvinfo *drvinfo) 126 126 { 127 - strlcpy(drvinfo->driver, opa_vnic_driver_name, sizeof(drvinfo->driver)); 128 - strlcpy(drvinfo->bus_info, dev_name(netdev->dev.parent), 127 + strscpy(drvinfo->driver, opa_vnic_driver_name, sizeof(drvinfo->driver)); 128 + strscpy(drvinfo->bus_info, dev_name(netdev->dev.parent), 129 129 sizeof(drvinfo->bus_info)); 130 130 } 131 131
+1 -1
drivers/infiniband/ulp/srpt/ib_srpt.c
··· 2300 2300 goto free_recv_ring; 2301 2301 } 2302 2302 2303 - strlcpy(ch->sess_name, src_addr, sizeof(ch->sess_name)); 2303 + strscpy(ch->sess_name, src_addr, sizeof(ch->sess_name)); 2304 2304 snprintf(i_port_id, sizeof(i_port_id), "0x%016llx%016llx", 2305 2305 be64_to_cpu(*(__be64 *)nexus->i_port_id), 2306 2306 be64_to_cpu(*(__be64 *)(nexus->i_port_id + 8)));
+1 -1
include/rdma/rdma_vt.h
··· 445 445 * to work by setting the name manually here. 446 446 */ 447 447 dev_set_name(&rdi->ibdev.dev, fmt, name, unit); 448 - strlcpy(rdi->ibdev.name, dev_name(&rdi->ibdev.dev), IB_DEVICE_NAME_MAX); 448 + strscpy(rdi->ibdev.name, dev_name(&rdi->ibdev.dev), IB_DEVICE_NAME_MAX); 449 449 } 450 450 451 451 /**