From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Len Baker <len.baker@gmx.com>
Cc: Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Chaitanya Kulkarni <kch@nvidia.com>,
Kees Cook <keescook@chromium.org>,
linux-hardening@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nvmet: prefer flex_array_size and struct_size over open coded arithmetic
Date: Mon, 25 Oct 2021 16:05:03 -0500 [thread overview]
Message-ID: <20211025210503.GA1437674@embeddedor> (raw)
In-Reply-To: <20211024172921.4110-1-len.baker@gmx.com>
On Sun, Oct 24, 2021 at 07:29:21PM +0200, Len Baker wrote:
> In an effort to avoid open-coded arithmetic in the kernel [1], use the
> flex_array_size() and struct_size() helpers instead of an open-coded
> calculation.
>
> [1] https://github.com/KSPP/linux/issues/160
>
> Signed-off-by: Len Baker <len.baker@gmx.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/nvme/host/multipath.c | 2 +-
> drivers/nvme/target/admin-cmd.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
> index 954e84df6eb7..7f2071f2460c 100644
> --- a/drivers/nvme/host/multipath.c
> +++ b/drivers/nvme/host/multipath.c
> @@ -562,7 +562,7 @@ static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
> return -EINVAL;
>
> nr_nsids = le32_to_cpu(desc->nnsids);
> - nsid_buf_size = nr_nsids * sizeof(__le32);
> + nsid_buf_size = flex_array_size(desc, nsids, nr_nsids);
>
> if (WARN_ON_ONCE(desc->grpid == 0))
> return -EINVAL;
> diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
> index 403de678fd06..6fb24746de06 100644
> --- a/drivers/nvme/target/admin-cmd.c
> +++ b/drivers/nvme/target/admin-cmd.c
> @@ -264,7 +264,7 @@ static u32 nvmet_format_ana_group(struct nvmet_req *req, u32 grpid,
> desc->chgcnt = cpu_to_le64(nvmet_ana_chgcnt);
> desc->state = req->port->ana_state[grpid];
> memset(desc->rsvd17, 0, sizeof(desc->rsvd17));
> - return sizeof(struct nvme_ana_group_desc) + count * sizeof(__le32);
> + return struct_size(desc, nsids, count);
> }
>
> static void nvmet_execute_get_log_page_ana(struct nvmet_req *req)
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-10-25 21:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 17:29 [PATCH] nvmet: prefer flex_array_size and struct_size over open coded arithmetic Len Baker
2021-10-25 7:18 ` Sagi Grimberg
2021-10-25 21:05 ` Gustavo A. R. Silva [this message]
2021-10-27 0:13 ` Chaitanya Kulkarni
2021-10-27 6:07 ` Christoph Hellwig
2021-10-29 17:04 ` Len Baker
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=20211025210503.GA1437674@embeddedor \
--to=gustavoars@kernel.org \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=keescook@chromium.org \
--cc=len.baker@gmx.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.