Skip to content

Commit adb77bb

Browse files
committed
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: b7e9712 ("scsi: mpt3sas: Replace deprecated strncpy() with strscpy()") Signed-off-by: Kees Cook <keescook@chromium.org> Tested-by: Marco Patalano <mpatalan@redhat.com> Reviewed-by: Ewan D. Milne <emilne@redhat.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20240410023155.2100422-3-keescook@chromium.org Signed-off-by: Kees Cook <kees@kernel.org>
1 parent 1613e60 commit adb77bb

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4774,7 +4774,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
47744774
char desc[17] = {0};
47754775
u32 iounit_pg1_flags;
47764776

4777-
strscpy(desc, ioc->manu_pg0.ChipName, sizeof(desc));
4777+
memtostr(desc, ioc->manu_pg0.ChipName);
47784778
ioc_info(ioc, "%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x)\n",
47794779
desc,
47804780
(ioc->facts.FWVersion.Word & 0xFF000000) >> 24,

drivers/scsi/mpt3sas/mpt3sas_transport.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -458,17 +458,13 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc,
458458
goto out;
459459

460460
manufacture_reply = data_out + sizeof(struct rep_manu_request);
461-
strscpy(edev->vendor_id, manufacture_reply->vendor_id,
462-
sizeof(edev->vendor_id));
463-
strscpy(edev->product_id, manufacture_reply->product_id,
464-
sizeof(edev->product_id));
465-
strscpy(edev->product_rev, manufacture_reply->product_rev,
466-
sizeof(edev->product_rev));
461+
memtostr(edev->vendor_id, manufacture_reply->vendor_id);
462+
memtostr(edev->product_id, manufacture_reply->product_id);
463+
memtostr(edev->product_rev, manufacture_reply->product_rev);
467464
edev->level = manufacture_reply->sas_format & 1;
468465
if (edev->level) {
469-
strscpy(edev->component_vendor_id,
470-
manufacture_reply->component_vendor_id,
471-
sizeof(edev->component_vendor_id));
466+
memtostr(edev->component_vendor_id,
467+
manufacture_reply->component_vendor_id);
472468
tmp = (u8 *)&manufacture_reply->component_id;
473469
edev->component_id = tmp[0] << 8 | tmp[1];
474470
edev->component_revision_id =

0 commit comments

Comments
 (0)