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: b7e9712a02e8 ("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>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 258647fc6bddb42b6c484bfb73055f6e40cb1c2a..1320e06727df19188e285ec99276b0f66a0704ab 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -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,

diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index 76f9a91771985baed3ede562c19c5df830696608..d84413b77d84999d5c3d43490575122123794d5d 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -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 =