From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Len Baker <len.baker@gmx.com>
Cc: Arend van Spriel <aspriel@gmail.com>,
Franky Lin <franky.lin@broadcom.com>,
Hante Meuleman <hante.meuleman@broadcom.com>,
Chi-hsien Lin <chi-hsien.lin@infineon.com>,
Wright Feng <wright.feng@infineon.com>,
Chung-hsien Hsu <chung-hsien.hsu@infineon.com>,
Kalle Valo <kvalo@codeaurora.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
Kees Cook <keescook@chromium.org>,
Shawn Guo <shawn.guo@linaro.org>,
linux-wireless@vger.kernel.org,
brcm80211-dev-list.pdl@broadcom.com,
SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] brcmfmac: Replace zero-length array with flexible array member
Date: Sun, 12 Sep 2021 14:15:36 -0500 [thread overview]
Message-ID: <20210912191536.GB146608@embeddedor> (raw)
In-Reply-To: <20210904092217.2848-1-len.baker@gmx.com>
On Sat, Sep 04, 2021 at 11:22:17AM +0200, Len Baker wrote:
> There is a regular need in the kernel to provide a way to declare
> having a dynamically sized set of trailing elements in a structure.
> Kernel code should always use "flexible array members"[1] for these
> cases. The older style of one-element or zero-length arrays should
> no longer be used[2].
>
> Also, make use of the struct_size() helper in devm_kzalloc().
>
> [1] https://en.wikipedia.org/wiki/Flexible_array_member
> [2] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#zero-length-and-one-element-arrays
>
> Signed-off-by: Len Baker <len.baker@gmx.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
I'll take this in my -next tree. :)
Thanks, Len.
--
Gustavo
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 +-
> include/linux/platform_data/brcmfmac.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index 2f7bc3a70c65..513c7e6421b2 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -29,7 +29,7 @@ static int brcmf_of_get_country_codes(struct device *dev,
> return (count == -EINVAL) ? 0 : count;
> }
>
> - cc = devm_kzalloc(dev, sizeof(*cc) + count * sizeof(*cce), GFP_KERNEL);
> + cc = devm_kzalloc(dev, struct_size(cc, table, count), GFP_KERNEL);
> if (!cc)
> return -ENOMEM;
>
> diff --git a/include/linux/platform_data/brcmfmac.h b/include/linux/platform_data/brcmfmac.h
> index 1d30bf278231..2b5676ff35be 100644
> --- a/include/linux/platform_data/brcmfmac.h
> +++ b/include/linux/platform_data/brcmfmac.h
> @@ -125,7 +125,7 @@ struct brcmfmac_pd_cc_entry {
> */
> struct brcmfmac_pd_cc {
> int table_size;
> - struct brcmfmac_pd_cc_entry table[0];
> + struct brcmfmac_pd_cc_entry table[];
> };
>
> /**
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-09-12 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-04 9:22 [PATCH] brcmfmac: Replace zero-length array with flexible array member Len Baker
2021-09-12 19:15 ` Gustavo A. R. Silva [this message]
2021-09-16 15:17 ` Kalle Valo
2021-09-21 5:55 ` Kalle Valo
2021-09-21 17:37 ` Gustavo A. R. Silva
2021-09-24 11:20 ` Kalle Valo
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=20210912191536.GB146608@embeddedor \
--to=gustavoars@kernel.org \
--cc=SHA-cyfmac-dev-list@infineon.com \
--cc=aspriel@gmail.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=chi-hsien.lin@infineon.com \
--cc=chung-hsien.hsu@infineon.com \
--cc=davem@davemloft.net \
--cc=franky.lin@broadcom.com \
--cc=gustavo@embeddedor.com \
--cc=hante.meuleman@broadcom.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=len.baker@gmx.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=wright.feng@infineon.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;
as well as URLs for NNTP newsgroup(s).