* [PATCH 0/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member
@ 2022-11-14 23:00 Gustavo A. R. Silva
2022-11-14 23:01 ` [PATCH 1/2][next] " Gustavo A. R. Silva
2022-11-14 23:02 ` [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config Gustavo A. R. Silva
0 siblings, 2 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2022-11-14 23:00 UTC (permalink / raw)
To: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, Gustavo A. R. Silva,
linux-hardening
Hi!
This series aims to replace a one-element array with flexible-array
member in drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE
routines on memcpy() and help us make progress towards globally
enabling -fstrict-flex-arrays=3 [1].
Link: https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays
Link: https://github.com/KSPP/linux/issues/79
Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Gustavo A. R. Silva (2):
wifi: brcmfmac: Replace one-element array with flexible-array member
wifi: brcmfmac: Use struct_size() and array_size() in code ralated to
struct brcmf_gscan_config
.../net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member
2022-11-14 23:00 [PATCH 0/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member Gustavo A. R. Silva
@ 2022-11-14 23:01 ` Gustavo A. R. Silva
2022-11-17 23:16 ` Kees Cook
2022-11-22 10:14 ` Kalle Valo
2022-11-14 23:02 ` [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config Gustavo A. R. Silva
1 sibling, 2 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2022-11-14 23:01 UTC (permalink / raw)
To: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, Gustavo A. R. Silva,
linux-hardening
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in struct brcmf_gscan_config.
Important to mention is that doing a build before/after this patch results
in no binary output differences.
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines
on memcpy() and help us make progress towards globally enabling
-fstrict-flex-arrays=3 [1].
Link: https://github.com/KSPP/linux/issues/79
Link: https://github.com/KSPP/linux/issues/241
Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
index f518e025d6e4..62f65dc6a3b9 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
@@ -1049,7 +1049,7 @@ struct brcmf_gscan_config {
u8 count_of_channel_buckets;
u8 retry_threshold;
__le16 lost_ap_window;
- struct brcmf_gscan_bucket_config bucket[1];
+ struct brcmf_gscan_bucket_config bucket[];
};
/**
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
index 170c61c8136c..7c5da506637f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -405,7 +405,7 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
if (n_buckets < 0)
return n_buckets;
- gsz = sizeof(*gscan_cfg) + (n_buckets - 1) * sizeof(*buckets);
+ gsz = sizeof(*gscan_cfg) + n_buckets * sizeof(*buckets);
gscan_cfg = kzalloc(gsz, GFP_KERNEL);
if (!gscan_cfg) {
err = -ENOMEM;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config
2022-11-14 23:00 [PATCH 0/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member Gustavo A. R. Silva
2022-11-14 23:01 ` [PATCH 1/2][next] " Gustavo A. R. Silva
@ 2022-11-14 23:02 ` Gustavo A. R. Silva
2022-11-17 23:16 ` Kees Cook
1 sibling, 1 reply; 6+ messages in thread
From: Gustavo A. R. Silva @ 2022-11-14 23:02 UTC (permalink / raw)
To: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, Gustavo A. R. Silva,
linux-hardening
Prefer struct_size() over open-coded versions of idiom:
sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to
contain.
Also, use array_size() in call to memcpy().
Link: https://github.com/KSPP/linux/issues/160
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
index 7c5da506637f..05f66ab13bed 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -405,7 +405,7 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
if (n_buckets < 0)
return n_buckets;
- gsz = sizeof(*gscan_cfg) + n_buckets * sizeof(*buckets);
+ gsz = struct_size(gscan_cfg, bucket, n_buckets);
gscan_cfg = kzalloc(gsz, GFP_KERNEL);
if (!gscan_cfg) {
err = -ENOMEM;
@@ -434,8 +434,8 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
gscan_cfg->flags = BRCMF_GSCAN_CFG_ALL_BUCKETS_IN_1ST_SCAN;
gscan_cfg->count_of_channel_buckets = n_buckets;
- memcpy(&gscan_cfg->bucket[0], buckets,
- n_buckets * sizeof(*buckets));
+ memcpy(gscan_cfg->bucket, buckets,
+ array_size(n_buckets, sizeof(*buckets)));
err = brcmf_fil_iovar_data_set(ifp, "pfn_gscan_cfg", gscan_cfg, gsz);
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member
2022-11-14 23:01 ` [PATCH 1/2][next] " Gustavo A. R. Silva
@ 2022-11-17 23:16 ` Kees Cook
2022-11-22 10:14 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kees Cook @ 2022-11-17 23:16 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, linux-hardening
On Mon, Nov 14, 2022 at 05:01:11PM -0600, Gustavo A. R. Silva wrote:
> One-element arrays are deprecated, and we are replacing them with flexible
> array members instead. So, replace one-element array with flexible-array
> member in struct brcmf_gscan_config.
>
> Important to mention is that doing a build before/after this patch results
> in no binary output differences.
>
> This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines
> on memcpy() and help us make progress towards globally enabling
> -fstrict-flex-arrays=3 [1].
>
> Link: https://github.com/KSPP/linux/issues/79
> Link: https://github.com/KSPP/linux/issues/241
> Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config
2022-11-14 23:02 ` [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config Gustavo A. R. Silva
@ 2022-11-17 23:16 ` Kees Cook
0 siblings, 0 replies; 6+ messages in thread
From: Kees Cook @ 2022-11-17 23:16 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, linux-hardening
On Mon, Nov 14, 2022 at 05:02:06PM -0600, Gustavo A. R. Silva wrote:
> Prefer struct_size() over open-coded versions of idiom:
>
> sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
>
> where count is the max number of items the flexible array is supposed to
> contain.
>
> Also, use array_size() in call to memcpy().
>
> Link: https://github.com/KSPP/linux/issues/160
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member
2022-11-14 23:01 ` [PATCH 1/2][next] " Gustavo A. R. Silva
2022-11-17 23:16 ` Kees Cook
@ 2022-11-22 10:14 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2022-11-22 10:14 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni,
brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, netdev,
linux-wireless, linux-kernel, Gustavo A. R. Silva,
linux-hardening
"Gustavo A. R. Silva" <gustavoars@kernel.org> wrote:
> One-element arrays are deprecated, and we are replacing them with flexible
> array members instead. So, replace one-element array with flexible-array
> member in struct brcmf_gscan_config.
>
> Important to mention is that doing a build before/after this patch results
> in no binary output differences.
>
> This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines
> on memcpy() and help us make progress towards globally enabling
> -fstrict-flex-arrays=3 [1].
>
> Link: https://github.com/KSPP/linux/issues/79
> Link: https://github.com/KSPP/linux/issues/241
> Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> Reviewed-by: Kees Cook <keescook@chromium.org>
2 patches applied to wireless-next.git, thanks.
61b0853d0314 wifi: brcmfmac: Replace one-element array with flexible-array member
f0e0897b4c7e wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config
--
https://patchwork.kernel.org/project/linux-wireless/patch/7694550aa9a2753a73a687f61af9441c8cf52fd7.1668466470.git.gustavoars@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-22 10:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-14 23:00 [PATCH 0/2][next] wifi: brcmfmac: Replace one-element array with flexible-array member Gustavo A. R. Silva
2022-11-14 23:01 ` [PATCH 1/2][next] " Gustavo A. R. Silva
2022-11-17 23:16 ` Kees Cook
2022-11-22 10:14 ` Kalle Valo
2022-11-14 23:02 ` [PATCH 2/2][next] wifi: brcmfmac: Use struct_size() and array_size() in code ralated to struct brcmf_gscan_config Gustavo A. R. Silva
2022-11-17 23:16 ` Kees Cook
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.