Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: R7LXTPligYfpj0YBiFf8XqIetSyxPOFXIutO+7CNjKTwxIKkDKXnoYhBgMdlIG1V8h0xZBfKvK
 0OGkiQknZzBQ==
IronPort-SDR: U+6NM1TVT/JBOh9yH7l/2NInKimE0JJKDaqlGj7kO+scaQs2dICn01LZDO8v6HNYL18V1KfuHP
 zUurPDKoUQGw==
From:   "Allan, Bruce W" <bruce.w.allan@intel.com>
To:     "Gustavo A. R. Silva" <gustavoars@kernel.org>,
        "Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        "Jakub Kicinski" <kuba@kernel.org>
CC:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "intel-wired-lan@lists.osuosl.org" <intel-wired-lan@lists.osuosl.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [Intel-wired-lan] [PATCH][next] ice: Use struct_size() helper
Thread-Topic: [Intel-wired-lan] [PATCH][next] ice: Use struct_size() helper
Thread-Index: AQHWRmIzcKfnt6Gt3Uee+46ZItnIpqjlF5ig
Date:   Mon, 22 Jun 2020 20:23:05 +0000
Message-ID: <BYAPR11MB27429F471B0D17894F6900E4B5970@BYAPR11MB2742.namprd11.prod.outlook.com>
References: <20200619175611.GA27719@embeddedor>
In-Reply-To: <20200619175611.GA27719@embeddedor>
Accept-Language: en-US
Content-Language: en-US
dlp-version: 11.2.0.6
dlp-product: dlpe-windows
dlp-reaction: no-action
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b366454f-03d7-4c8f-7252-08d816ea1243
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 20:23:05.6484
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 2QQlJ5FfkF2C6WclSPN0XcxrymoQqy88nnZob7zSIt21aqTqcukdZSHeZYQCKhS8t/NHsf3TG0WYvbEOjsf0lw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3702
X-OriginatorOrg: intel.com
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Gustavo A. R. Silva
> Sent: Friday, June 19, 2020 10:56 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; David S. Miller
> <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>
> Cc: netdev@vger.kernel.org; intel-wired-lan@lists.osuosl.org; linux-
> kernel@vger.kernel.org
> Subject: [Intel-wired-lan] [PATCH][next] ice: Use struct_size() helper
>=20
> Make use of the struct_size() helper instead of an open-coded version
> in order to avoid any potential type mistakes.
>=20
> This code was detected with the help of Coccinelle and, audited and
> fixed manually.
>=20
> Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> ---
>  drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

This is already fixed in an in-process patch-set that converts one-element =
arrays to flexible-arrays
that Jeff Kirsher has mentioned before and should be pushed shortly.

>=20
> diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
> b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
> index 4420fc02f7e7..d92c4d70dbcd 100644
> --- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
> +++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
> @@ -1121,8 +1121,7 @@ static enum ice_status ice_get_pkg_info(struct
> ice_hw *hw)
>  	u16 size;
>  	u32 i;
>=20
> -	size =3D sizeof(*pkg_info) + (sizeof(pkg_info->pkg_info[0]) *
> -				    (ICE_PKG_CNT - 1));
> +	size =3D struct_size(pkg_info, pkg_info, ICE_PKG_CNT - 1);
>  	pkg_info =3D kzalloc(size, GFP_KERNEL);
>  	if (!pkg_info)
>  		return ICE_ERR_NO_MEMORY;
> --
> 2.27.0
>=20
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan