linux-hardening - Re: [PATCH 2/6] scsi: message: fusion: struct _CONFIG_PAGE_SAS_IO_UNIT_0: Replace 1-element array with flexible array

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <150c78b4-be2f-496b-be5f-7d2454edd17a@embeddedor.com>
Date: Thu, 11 Jul 2024 12:14:51 -0600
From: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To: Kees Cook <kees@...nel.org>, Sathya Prakash <sathya.prakash@...adcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@...adcom.com>,
 Suganath Prabu Subramani <suganath-prabu.subramani@...adcom.com>,
 "Gustavo A. R. Silva" <gustavoars@...nel.org>,
 MPT-FusionLinux.pdl@...adcom.com, linux-scsi@...r.kernel.org,
 linux-hardening@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/6] scsi: message: fusion: struct
 _CONFIG_PAGE_SAS_IO_UNIT_0: Replace 1-element array with flexible array



On 11/07/24 11:28, Kees Cook wrote:
> Replace the deprecated[1] use of a 1-element array in
> struct _CONFIG_PAGE_SAS_IO_UNIT_0 with a modern flexible array.
> 
> Additionally add __counted_by annotation since PhyData is only ever
> accessed via a loops bounded by NumPhys:
> 
> lsi/mpi_cnfg.h:    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[] __counted_by(NumPhys);    /* 10h */
> mptsas.c:       port_info->num_phys = buffer->NumPhys;
> mptsas.c:       for (i = 0; i < port_info->num_phys; i++) {
> mptsas.c:               mptsas_print_phy_data(ioc, &buffer->PhyData[i]);
> mptsas.c:               port_info->phy_info[i].phy_id = i;
> mptsas.c:               port_info->phy_info[i].port_id =
> mptsas.c:                   buffer->PhyData[i].Port;
> mptsas.c:               port_info->phy_info[i].negotiated_link_rate =
> mptsas.c:                   buffer->PhyData[i].NegotiatedLinkRate;
> 
> No binary differences are present after this conversion.
> 
> Link: https://github.com/KSPP/linux/issues/79 [1]
> Signed-off-by: Kees Cook <kees@...nel.org>

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

Thanks!
-- 
Gustavo

> ---
> Cc: Sathya Prakash <sathya.prakash@...adcom.com>
> Cc: Sreekanth Reddy <sreekanth.reddy@...adcom.com>
> Cc: Suganath Prabu Subramani <suganath-prabu.subramani@...adcom.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
> Cc: MPT-FusionLinux.pdl@...adcom.com
> Cc: linux-scsi@...r.kernel.org
> Cc: linux-hardening@...r.kernel.org
> ---
>   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 f59a741ef21c..c7997e32e82e 100644
> --- a/drivers/message/fusion/lsi/mpi_cnfg.h
> +++ b/drivers/message/fusion/lsi/mpi_cnfg.h
> @@ -2547,14 +2547,6 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA
>   } MPI_SAS_IO_UNIT0_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT0_PHY_DATA,
>     SasIOUnit0PhyData, MPI_POINTER pSasIOUnit0PhyData;
>   
> -/*
> - * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
> - * one and check Header.PageLength at runtime.
> - */
> -#ifndef MPI_SAS_IOUNIT0_PHY_MAX
> -#define MPI_SAS_IOUNIT0_PHY_MAX         (1)
> -#endif
> -
>   typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
>   {
>       CONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */
> @@ -2563,7 +2555,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
>       U8                              NumPhys;                            /* 0Ch */
>       U8                              Reserved2;                          /* 0Dh */
>       U16                             Reserved3;                          /* 0Eh */
> -    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[MPI_SAS_IOUNIT0_PHY_MAX];   /* 10h */
> +    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[] __counted_by(NumPhys);    /* 10h */
>   } CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
>     SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;
>