From: Petr Machata <petrm@nvidia.com>
To: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Ido Schimmel <idosch@nvidia.com>, Petr Machata <petrm@nvidia.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-hardening@vger.kernel.org>
Subject: Re: [PATCH][next] mlxsw: spectrum_kvdl: Use struct_size() helper in kzalloc()
Date: Wed, 26 Jan 2022 11:55:04 +0100 [thread overview]
Message-ID: <87pmoen4ro.fsf@nvidia.com> (raw)
In-Reply-To: <20220125170128.GA60918@embeddedor>
"Gustavo A. R. Silva" <gustavoars@kernel.org> writes:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
>
> Also, address the following sparse warnings:
> drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c:229:24: warning: using sizeof on a flexible structure
>
> Link: https://github.com/KSPP/linux/issues/174
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> ---
> drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
> index a9fff8adc75e..d20e794e01ca 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
> @@ -213,7 +213,6 @@ mlxsw_sp1_kvdl_part_init(struct mlxsw_sp *mlxsw_sp,
> struct mlxsw_sp1_kvdl_part *part;
> bool need_update = true;
> unsigned int nr_entries;
> - size_t usage_size;
> u64 resource_size;
> int err;
>
> @@ -225,8 +224,8 @@ mlxsw_sp1_kvdl_part_init(struct mlxsw_sp *mlxsw_sp,
> }
>
> nr_entries = div_u64(resource_size, info->alloc_size);
> - usage_size = BITS_TO_LONGS(nr_entries) * sizeof(unsigned long);
> - part = kzalloc(sizeof(*part) + usage_size, GFP_KERNEL);
> + part = kzalloc(struct_size(part, usage, BITS_TO_LONGS(nr_entries)),
> + GFP_KERNEL);
> if (!part)
> return ERR_PTR(-ENOMEM);
Reviewed-by: Petr Machata <petrm@nvidia.com>
prev parent reply other threads:[~2022-01-26 10:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 17:01 [PATCH][next] mlxsw: spectrum_kvdl: Use struct_size() helper in kzalloc() Gustavo A. R. Silva
2022-01-26 7:54 ` Ido Schimmel
2022-01-26 10:55 ` Petr Machata [this message]
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=87pmoen4ro.fsf@nvidia.com \
--to=petrm@nvidia.com \
--cc=davem@davemloft.net \
--cc=gustavoars@kernel.org \
--cc=idosch@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).