aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKees Cook <kees@kernel.org>2025-02-05 13:40:37 -0800
committerKees Cook <kees@kernel.org>2025-02-28 11:51:31 -0800
commite1de43aea35f78b796367e861b59541fa0cf61ba (patch)
tree88e5b456d8aee0865257d2fc1706de6f2ea10b1d
parentscsi: mptfusion: Mark device strings as nonstring (diff)
downloadwireguard-linux-e1de43aea35f78b796367e861b59541fa0cf61ba.tar.xz
wireguard-linux-e1de43aea35f78b796367e861b59541fa0cf61ba.zip
scsi: mpi3mr: Mark device strings as nonstring
In preparation for memtostr*() checking that its source is marked as nonstring, annotate the device strings accordingly. Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> # SCSI Signed-off-by: Kees Cook <kees@kernel.org>
-rw-r--r--drivers/scsi/mpi3mr/mpi3mr_transport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/mpi3mr/mpi3mr_transport.c b/drivers/scsi/mpi3mr/mpi3mr_transport.c
index 0ba9e6a6a13c..c8d6ced5640e 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@ -105,10 +105,10 @@ struct rep_manu_reply {
u8 reserved0[2];
u8 sas_format;
u8 reserved2[3];
- u8 vendor_id[SAS_EXPANDER_VENDOR_ID_LEN];
- u8 product_id[SAS_EXPANDER_PRODUCT_ID_LEN];
- u8 product_rev[SAS_EXPANDER_PRODUCT_REV_LEN];
- u8 component_vendor_id[SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN];
+ u8 vendor_id[SAS_EXPANDER_VENDOR_ID_LEN] __nonstring;
+ u8 product_id[SAS_EXPANDER_PRODUCT_ID_LEN] __nonstring;
+ u8 product_rev[SAS_EXPANDER_PRODUCT_REV_LEN] __nonstring;
+ u8 component_vendor_id[SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN] __nonstring;
u16 component_id;
u8 component_revision_id;
u8 reserved3;