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: 2bd37e284914 ("scsi: mpi3mr: Add framework to issue MPT transport cmds")
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240410023155.2100422-4-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_transport.c b/drivers/scsi/mpi3mr/mpi3mr_transport.c
index d32ad46318cb09af970085b3ab00fc376a934e4f..231b4d0df85f37b3dbb4cb5fe5bb0b3aefdce37f 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@ -209,17 +209,13 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc,
                goto out;
        }
 
-       strscpy(edev->vendor_id, manufacture_reply->vendor_id,
-            SAS_EXPANDER_VENDOR_ID_LEN);
-       strscpy(edev->product_id, manufacture_reply->product_id,
-            SAS_EXPANDER_PRODUCT_ID_LEN);
-       strscpy(edev->product_rev, manufacture_reply->product_rev,
-            SAS_EXPANDER_PRODUCT_REV_LEN);
+       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,
-                    SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);
+               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 =