Re: [PATCH 3/6] scsi: message: fusion: struct _CONFIG_PAGE_RAID_PHYS_DISK_1: Replace 1-element array with flexible array

[Gustavo A. R. Silva]

On 11/07/24 11:28, Kees Cook wrote:
> 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: https://github.com/KSPP/linux/issues/79 [1]
> Signed-off-by: Kees Cook <kees@xxxxxxxxxx>

Reviewed-by: Gustavo A. R. Silva <gustavoars@xxxxxxxxxx>

Thanks
--
Gustavo

> ---
> Cc: Sathya Prakash <sathya.prakash@xxxxxxxxxxxx>
> Cc: Sreekanth Reddy <sreekanth.reddy@xxxxxxxxxxxx>
> Cc: Suganath Prabu Subramani <suganath-prabu.subramani@xxxxxxxxxxxx>
> Cc: "Gustavo A. R. Silva" <gustavoars@xxxxxxxxxx>
> Cc: MPT-FusionLinux.pdl@xxxxxxxxxxxx
> Cc: linux-scsi@xxxxxxxxxxxxxxx
> Cc: linux-hardening@xxxxxxxxxxxxxxx
> ---
>   drivers/message/fusion/lsi/mpi_cnfg.h | 10 +---------
>   1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
> index c7997e32e82e..e30132b57ae7 100644
> --- a/drivers/message/fusion/lsi/mpi_cnfg.h
> +++ b/drivers/message/fusion/lsi/mpi_cnfg.h
> @@ -2447,14 +2447,6 @@ typedef struct _RAID_PHYS_DISK1_PATH
>   #define MPI_RAID_PHYSDISK1_FLAG_INVALID         (0x0001)
>   
>   
> -/*
> - * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
> - * one and check Header.PageLength or NumPhysDiskPaths at runtime.
> - */
> -#ifndef MPI_RAID_PHYS_DISK1_PATH_MAX
> -#define MPI_RAID_PHYS_DISK1_PATH_MAX    (1)
> -#endif
> -
>   typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
>   {
>       CONFIG_PAGE_HEADER              Header;             /* 00h */
> @@ -2462,7 +2454,7 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
>       U8                              PhysDiskNum;        /* 05h */
>       U16                             Reserved2;          /* 06h */
>       U32                             Reserved1;          /* 08h */
> -    RAID_PHYS_DISK1_PATH            Path[MPI_RAID_PHYS_DISK1_PATH_MAX];/* 0Ch */
> +    RAID_PHYS_DISK1_PATH            Path[] __counted_by(NumPhysDiskPaths);/* 0Ch */
>   } CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,
>     RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
>