Commit adb77bba authored by Kees Cook's avatar Kees Cook
Browse files

scsi: mpt3sas: Avoid possible run-time warning with long manufacturer strings 



The prior strscpy() replacement of strncpy() here expected the
manufacture_reply strings to be NUL-terminated, but it is possible
they are not, as the code pattern here shows, e.g., edev->vendor_id
being exactly 1 character larger than manufacture_reply->vendor_id,
and the replaced strncpy() was copying only up to the size of the
source character array. Replace this with memtostr(), which is the
unambiguous way to convert a maybe not-NUL-terminated character array
into a NUL-terminated string.

Fixes: b7e9712a ("scsi: mpt3sas: Replace deprecated strncpy() with strscpy()")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarMarco Patalano <mpatalan@redhat.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240410023155.2100422-3-keescook@chromium.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 1613e604

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;



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

	memtostr(desc, ioc->manu_pg0.ChipName);

	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

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



		manufacture_reply = data_out + sizeof(struct rep_manu_request);

		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));

		memtostr(edev->vendor_id, manufacture_reply->vendor_id);

		memtostr(edev->product_id, manufacture_reply->product_id);

		memtostr(edev->product_rev, manufacture_reply->product_rev);

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

		if (edev->level) {

			strscpy(edev->component_vendor_id,

				manufacture_reply->component_vendor_id,

				sizeof(edev->component_vendor_id));

			memtostr(edev->component_vendor_id,

				 manufacture_reply->component_vendor_id);

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

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

			edev->component_revision_id =