From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85A31C28CC0 for ; Thu, 30 May 2019 18:30:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 625BD25FA8 for ; Thu, 30 May 2019 18:30:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbfE3SaE (ORCPT ); Thu, 30 May 2019 14:30:04 -0400 Received: from mga12.intel.com ([192.55.52.136]:19647 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726328AbfE3SaE (ORCPT ); Thu, 30 May 2019 14:30:04 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 May 2019 11:30:03 -0700 X-ExtLoop1: 1 Received: from unknown (HELO [10.228.129.69]) ([10.228.129.69]) by orsmga007.jf.intel.com with ESMTP; 30 May 2019 11:30:01 -0700 Subject: Re: [PATCH][next] IB/hfi1: Use struct_size() helper To: "Gustavo A. R. Silva" , Mike Marciniszyn , Doug Ledford , Jason Gunthorpe Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org References: <20190529151528.GA24148@embeddedor> From: Dennis Dalessandro Message-ID: <1f382255-fdce-1f3d-d336-c36b09116c7e@intel.com> Date: Thu, 30 May 2019 14:30:01 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190529151528.GA24148@embeddedor> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/29/2019 11:15 AM, Gustavo A. R. Silva wrote: > Make use of the struct_size() helper instead of an open-coded version > in order to avoid any potential type mistakes, in particular in the > context in which this code is being used. > > So, replace the following form: > > sizeof(struct opa_port_status_rsp) + num_vls * sizeof(struct _vls_pctrs) > > with: > > struct_size(rsp, vls, num_vls) > > and so on... > > Also, notice that variable size is unnecessary, hence it is removed. > > This code was detected with the help of Coccinelle. > > Signed-off-by: Gustavo A. R. Silva > --- > drivers/infiniband/hw/hfi1/mad.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c > index 4228393e6c4c..184dba3c2828 100644 > --- a/drivers/infiniband/hw/hfi1/mad.c > +++ b/drivers/infiniband/hw/hfi1/mad.c > @@ -2744,8 +2744,7 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp, > u16 link_width; > u16 link_speed; > > - response_data_size = sizeof(struct opa_port_status_rsp) + > - num_vls * sizeof(struct _vls_pctrs); > + response_data_size = struct_size(rsp, vls, num_vls); > if (response_data_size > sizeof(pmp->data)) { > pmp->mad_hdr.status |= OPA_PM_STATUS_REQUEST_TOO_LARGE; > return reply((struct ib_mad_hdr *)pmp); > @@ -3014,8 +3013,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, > } > > /* Sanity check */ > - response_data_size = sizeof(struct opa_port_data_counters_msg) + > - num_vls * sizeof(struct _vls_dctrs); > + response_data_size = struct_size(req, port[0].vls, num_vls); > > if (response_data_size > sizeof(pmp->data)) { > pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; > @@ -3232,8 +3230,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp, > return reply((struct ib_mad_hdr *)pmp); > } > > - response_data_size = sizeof(struct opa_port_error_counters64_msg) + > - num_vls * sizeof(struct _vls_ectrs); > + response_data_size = struct_size(req, port[0].vls, num_vls); > > if (response_data_size > sizeof(pmp->data)) { > pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; > Reviewed-by: Dennis Dalessandro