Commit 5fcc60dc authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "scsi: replace deprecated strncpy" 

Justin Stitt <justinstitt@google.com> says:

This series contains multiple replacements of strncpy throughout the
scsi subsystem.

strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces. The details of each replacement will be in their
respective patch.

Link: https://lore.kernel.org/r/20240305-strncpy-drivers-scsi-mpi3mr-mpi3mr_fw-c-v3-0-5b78a13ff984@google.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents f02fe780 855ce06f

drivers/net/ethernet/qlogic/qed/qed_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ static int qed_slowpath_start(struct qed_dev *cdev, 
				      (params->drv_rev << 8) |

				      (params->drv_eng);

		strscpy(drv_version.name, params->name,

			MCP_DRV_VER_STR_SIZE - 4);

			sizeof(drv_version.name));

		rc = qed_mcp_send_drv_version(hwfn, hwfn->p_main_ptt,

					      &drv_version);

		if (rc) {

drivers/scsi/mpi3mr/mpi3mr_fw.c

+5 −5
Original line number Diff line number Diff line
@@ -3676,7 +3676,7 @@ static const struct { 
 * mpi3mr_print_ioc_info - Display controller information

 * @mrioc: Adapter instance reference

 *

 * Display controller personalit, capability, supported

 * Display controller personality, capability, supported

 * protocols etc.

 *

 * Return: Nothing
@@ -3685,20 +3685,20 @@ static void 
mpi3mr_print_ioc_info(struct mpi3mr_ioc *mrioc)

{

	int i = 0, bytes_written = 0;

	char personality[16];

	const char *personality;

	char protocol[50] = {0};

	char capabilities[100] = {0};

	struct mpi3mr_compimg_ver *fwver = &mrioc->facts.fw_ver;



	switch (mrioc->facts.personality) {

	case MPI3_IOCFACTS_FLAGS_PERSONALITY_EHBA:

		strncpy(personality, "Enhanced HBA", sizeof(personality));

		personality = "Enhanced HBA";

		break;

	case MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR:

		strncpy(personality, "RAID", sizeof(personality));

		personality = "RAID";

		break;

	default:

		strncpy(personality, "Unknown", sizeof(personality));

		personality = "Unknown";

		break;

	}

drivers/scsi/mpt3sas/mpt3sas_base.c

+1 −1
Original line number Diff line number Diff line
@@ -4774,7 +4774,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) 
	char desc[17] = {0};

	u32 iounit_pg1_flags;



	strncpy(desc, ioc->manu_pg0.ChipName, 16);

	strscpy(desc, ioc->manu_pg0.ChipName, sizeof(desc));

	ioc_info(ioc, "%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x)\n",

		 desc,

		 (ioc->facts.FWVersion.Word & 0xFF000000) >> 24,

drivers/scsi/mpt3sas/mpt3sas_transport.c

+9 −9
Original line number Diff line number Diff line
@@ -458,17 +458,17 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc, 
			goto out;



		manufacture_reply = data_out + sizeof(struct rep_manu_request);

		strncpy(edev->vendor_id, manufacture_reply->vendor_id,

		     SAS_EXPANDER_VENDOR_ID_LEN);

		strncpy(edev->product_id, manufacture_reply->product_id,

		     SAS_EXPANDER_PRODUCT_ID_LEN);

		strncpy(edev->product_rev, manufacture_reply->product_rev,

		     SAS_EXPANDER_PRODUCT_REV_LEN);

		strscpy(edev->vendor_id, manufacture_reply->vendor_id,

			sizeof(edev->vendor_id));

		strscpy(edev->product_id, manufacture_reply->product_id,

			sizeof(edev->product_id));

		strscpy(edev->product_rev, manufacture_reply->product_rev,

			sizeof(edev->product_rev));

		edev->level = manufacture_reply->sas_format & 1;

		if (edev->level) {

			strncpy(edev->component_vendor_id,

			strscpy(edev->component_vendor_id,

				manufacture_reply->component_vendor_id,

			     SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);

				sizeof(edev->component_vendor_id));

			tmp = (u8 *)&manufacture_reply->component_id;

			edev->component_id = tmp[0] << 8 | tmp[1];

			edev->component_revision_id =

drivers/scsi/qedf/qedf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3468,7 +3468,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) 
	slowpath_params.drv_minor = QEDF_DRIVER_MINOR_VER;

	slowpath_params.drv_rev = QEDF_DRIVER_REV_VER;

	slowpath_params.drv_eng = QEDF_DRIVER_ENG_VER;

	strncpy(slowpath_params.name, "qedf", QED_DRV_VER_STR_SIZE);

	strscpy(slowpath_params.name, "qedf", sizeof(slowpath_params.name));

	rc = qed_ops->common->slowpath_start(qedf->cdev, &slowpath_params);

	if (rc) {

		QEDF_ERR(&(qedf->dbg_ctx), "Cannot start slowpath.\n");