Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
scsi: mpt3sas: 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>
+5
-5
+1
-1
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+1
-1
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
···
606
606
607
607
typedef struct _MPI2_CONFIG_PAGE_MAN_0 {
608
608
MPI2_CONFIG_PAGE_HEADER Header; /*0x00 */
609
-
U8 ChipName[16]; /*0x04 */
609
+
U8 ChipName[16] __nonstring; /*0x04 */
610
610
U8 ChipRevision[8]; /*0x14 */
611
611
U8 BoardName[16]; /*0x1C */
612
612
U8 BoardAssembly[16]; /*0x2C */
+4
-4
drivers/scsi/mpt3sas/mpt3sas_transport.c
+4
-4
drivers/scsi/mpt3sas/mpt3sas_transport.c
···
328
328
u8 reserved0[2];
329
329
u8 sas_format;
330
330
u8 reserved2[3];
331
-
u8 vendor_id[SAS_EXPANDER_VENDOR_ID_LEN];
332
-
u8 product_id[SAS_EXPANDER_PRODUCT_ID_LEN];
333
-
u8 product_rev[SAS_EXPANDER_PRODUCT_REV_LEN];
334
-
u8 component_vendor_id[SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN];
331
+
u8 vendor_id[SAS_EXPANDER_VENDOR_ID_LEN] __nonstring;
332
+
u8 product_id[SAS_EXPANDER_PRODUCT_ID_LEN] __nonstring;
333
+
u8 product_rev[SAS_EXPANDER_PRODUCT_REV_LEN] __nonstring;
334
+
u8 component_vendor_id[SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN] __nonstring;
335
335
u16 component_id;
336
336
u8 component_revision_id;
337
337
u8 reserved3;