Commit d4309246 authored by Kees Cook's avatar Kees Cook

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

The prior use of strscpy() 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 strscpy() 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: 2bd37e28 ("scsi: mpi3mr: Add framework to issue MPT transport cmds")
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240410023155.2100422-4-keescook@chromium.orgSigned-off-by: default avatarKees Cook <keescook@chromium.org>
parent 5bb288c4
...@@ -209,17 +209,13 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc, ...@@ -209,17 +209,13 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc,
goto out; goto out;
} }
strscpy(edev->vendor_id, manufacture_reply->vendor_id, memtostr(edev->vendor_id, manufacture_reply->vendor_id);
SAS_EXPANDER_VENDOR_ID_LEN); memtostr(edev->product_id, manufacture_reply->product_id);
strscpy(edev->product_id, manufacture_reply->product_id, memtostr(edev->product_rev, manufacture_reply->product_rev);
SAS_EXPANDER_PRODUCT_ID_LEN);
strscpy(edev->product_rev, manufacture_reply->product_rev,
SAS_EXPANDER_PRODUCT_REV_LEN);
edev->level = manufacture_reply->sas_format & 1; edev->level = manufacture_reply->sas_format & 1;
if (edev->level) { if (edev->level) {
strscpy(edev->component_vendor_id, memtostr(edev->component_vendor_id,
manufacture_reply->component_vendor_id, manufacture_reply->component_vendor_id);
SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);
tmp = (u8 *)&manufacture_reply->component_id; tmp = (u8 *)&manufacture_reply->component_id;
edev->component_id = tmp[0] << 8 | tmp[1]; edev->component_id = tmp[0] << 8 | tmp[1];
edev->component_revision_id = edev->component_revision_id =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment