Skip to content

Commit dc8932f

Browse files
keesmartinkpetersen
authored andcommitted
scsi: message: fusion: struct _CONFIG_PAGE_RAID_PHYS_DISK_1: Replace 1-element array with flexible array
Replace the deprecated[1] use of a 1-element array in struct _CONFIG_PAGE_RAID_PHYS_DISK_1 with a modern flexible array. Additionally add __counted_by annotation since Path is only ever accessed via a loops bounded by NumPhysDiskPaths: lsi/mpi_cnfg.h: RAID_PHYS_DISK1_PATH Path[] __counted_by(NumPhysDiskPaths);/* 0Ch */ mptbase.c: phys_disk->NumPhysDiskPaths = buffer->NumPhysDiskPaths; mptbase.c: for (i = 0; i < phys_disk->NumPhysDiskPaths; i++) { mptbase.c: phys_disk->Path[i].PhysDiskID = buffer->Path[i].PhysDiskID; mptbase.c: phys_disk->Path[i].PhysDiskBus = buffer->Path[i].PhysDiskBus; No binary differences are present after this conversion. Link: KSPP#79 [1] Signed-off-by: Kees Cook <kees@kernel.org> Link: https://lore.kernel.org/r/20240711172821.123936-3-kees@kernel.org Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 14c1f88 commit dc8932f

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

drivers/message/fusion/lsi/mpi_cnfg.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,22 +2447,14 @@ typedef struct _RAID_PHYS_DISK1_PATH
24472447
#define MPI_RAID_PHYSDISK1_FLAG_INVALID (0x0001)
24482448

24492449

2450-
/*
2451-
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
2452-
* one and check Header.PageLength or NumPhysDiskPaths at runtime.
2453-
*/
2454-
#ifndef MPI_RAID_PHYS_DISK1_PATH_MAX
2455-
#define MPI_RAID_PHYS_DISK1_PATH_MAX (1)
2456-
#endif
2457-
24582450
typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
24592451
{
24602452
CONFIG_PAGE_HEADER Header; /* 00h */
24612453
U8 NumPhysDiskPaths; /* 04h */
24622454
U8 PhysDiskNum; /* 05h */
24632455
U16 Reserved2; /* 06h */
24642456
U32 Reserved1; /* 08h */
2465-
RAID_PHYS_DISK1_PATH Path[MPI_RAID_PHYS_DISK1_PATH_MAX];/* 0Ch */
2457+
RAID_PHYS_DISK1_PATH Path[] __counted_by(NumPhysDiskPaths);/* 0Ch */
24662458
} CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,
24672459
RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
24682460

0 commit comments

Comments
 (0)