From: Dennis Dalessandro <dennis.dalessandro@intel.com>
To: "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
Mike Marciniszyn <mike.marciniszyn@intel.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH][next] IB/hfi1: Use struct_size() helper
Date: Thu, 30 May 2019 14:30:01 -0400 [thread overview]
Message-ID: <1f382255-fdce-1f3d-d336-c36b09116c7e@intel.com> (raw)
In-Reply-To: <20190529151528.GA24148@embeddedor>
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 <gustavo@embeddedor.com>
> ---
> 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 <dennis.dalessandro@intel.com>
next prev parent reply other threads:[~2019-05-30 18:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 15:15 Gustavo A. R. Silva
2019-05-30 18:30 ` Dennis Dalessandro [this message]
2019-05-30 18:43 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f382255-fdce-1f3d-d336-c36b09116c7e@intel.com \
--to=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=gustavo@embeddedor.com \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome