Merge tag 'hardening-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[sfrench/cifs-2.6.git] / drivers / scsi / mpi3mr / mpi3mr_transport.c

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 =