* [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by
@ 2023-09-15 20:05 Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2023-09-15 20:05 UTC (permalink / raw)
To: Arend van Spriel
Cc: Kees Cook, Franky Lin, Hante Meuleman, Kalle Valo,
Matthias Brugger, Hector Martin, Alvin Šipraga,
Hans de Goede, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, Nathan Chancellor, Nick Desaulniers, Tom Rix,
Russell King (Oracle), linux-kernel, llvm, linux-hardening
Prepare for the coming implementation by GCC and Clang of the __counted_by
attribute. Flexible array members annotated with __counted_by can have
their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
(for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
functions).
As found with Coccinelle[1], add __counted_by for struct brcmf_fw_request.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Arend van Spriel <aspriel@gmail.com>
Cc: Franky Lin <franky.lin@broadcom.com>
Cc: Hante Meuleman <hante.meuleman@broadcom.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: Matthias Brugger <mbrugger@suse.com>
Cc: Hector Martin <marcan@marcan.st>
Cc: "Alvin Šipraga" <alsi@bang-olufsen.dk>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: linux-wireless@vger.kernel.org
Cc: brcm80211-dev-list.pdl@broadcom.com
Cc: SHA-cyfmac-dev-list@infineon.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
index 1266cbaee072..4002d326fd21 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
@@ -69,7 +69,7 @@ struct brcmf_fw_request {
u16 bus_nr;
u32 n_items;
const char *board_types[BRCMF_FW_MAX_BOARD_TYPES];
- struct brcmf_fw_item items[];
+ struct brcmf_fw_item items[] __counted_by(n_items);
};
struct brcmf_fw_name {
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by
2023-09-15 20:05 [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by Kees Cook
@ 2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-20 7:01 ` Matthias Brugger
2023-09-20 11:15 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:32 UTC (permalink / raw)
To: Kees Cook, Arend van Spriel
Cc: Franky Lin, Hante Meuleman, Kalle Valo, Matthias Brugger,
Hector Martin, Alvin Šipraga, Hans de Goede, linux-wireless,
brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, Nathan Chancellor,
Nick Desaulniers, Tom Rix, Russell King (Oracle), linux-kernel,
llvm, linux-hardening
On 9/15/23 14:05, Kees Cook wrote:
> Prepare for the coming implementation by GCC and Clang of the __counted_by
> attribute. Flexible array members annotated with __counted_by can have
> their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
>
> As found with Coccinelle[1], add __counted_by for struct brcmf_fw_request.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Arend van Spriel <aspriel@gmail.com>
> Cc: Franky Lin <franky.lin@broadcom.com>
> Cc: Hante Meuleman <hante.meuleman@broadcom.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: Matthias Brugger <mbrugger@suse.com>
> Cc: Hector Martin <marcan@marcan.st>
> Cc: "Alvin Šipraga" <alsi@bang-olufsen.dk>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: brcm80211-dev-list.pdl@broadcom.com
> Cc: SHA-cyfmac-dev-list@infineon.com
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> index 1266cbaee072..4002d326fd21 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> @@ -69,7 +69,7 @@ struct brcmf_fw_request {
> u16 bus_nr;
> u32 n_items;
> const char *board_types[BRCMF_FW_MAX_BOARD_TYPES];
> - struct brcmf_fw_item items[];
> + struct brcmf_fw_item items[] __counted_by(n_items);
> };
>
> struct brcmf_fw_name {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by
2023-09-15 20:05 [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
@ 2023-09-20 7:01 ` Matthias Brugger
2023-09-20 11:15 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Matthias Brugger @ 2023-09-20 7:01 UTC (permalink / raw)
To: Kees Cook, Arend van Spriel
Cc: Franky Lin, Hante Meuleman, Kalle Valo, Hector Martin,
Alvin Šipraga, Hans de Goede, linux-wireless,
brcm80211-dev-list.pdl, SHA-cyfmac-dev-list, Nathan Chancellor,
Nick Desaulniers, Tom Rix, Russell King (Oracle), linux-kernel,
llvm, linux-hardening
On 15/09/2023 22:05, Kees Cook wrote:
> Prepare for the coming implementation by GCC and Clang of the __counted_by
> attribute. Flexible array members annotated with __counted_by can have
> their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
>
> As found with Coccinelle[1], add __counted_by for struct brcmf_fw_request.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Arend van Spriel <aspriel@gmail.com>
> Cc: Franky Lin <franky.lin@broadcom.com>
> Cc: Hante Meuleman <hante.meuleman@broadcom.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: Matthias Brugger <mbrugger@suse.com>
> Cc: Hector Martin <marcan@marcan.st>
> Cc: "Alvin Šipraga" <alsi@bang-olufsen.dk>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: brcm80211-dev-list.pdl@broadcom.com
> Cc: SHA-cyfmac-dev-list@infineon.com
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> index 1266cbaee072..4002d326fd21 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
> @@ -69,7 +69,7 @@ struct brcmf_fw_request {
> u16 bus_nr;
> u32 n_items;
> const char *board_types[BRCMF_FW_MAX_BOARD_TYPES];
> - struct brcmf_fw_item items[];
> + struct brcmf_fw_item items[] __counted_by(n_items);
> };
>
> struct brcmf_fw_name {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by
2023-09-15 20:05 [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-20 7:01 ` Matthias Brugger
@ 2023-09-20 11:15 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2023-09-20 11:15 UTC (permalink / raw)
To: Kees Cook
Cc: Arend van Spriel, Kees Cook, Franky Lin, Hante Meuleman,
Matthias Brugger, Hector Martin, Alvin Šipraga,
Hans de Goede, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, Nathan Chancellor, Nick Desaulniers, Tom Rix,
Russell King (Oracle), linux-kernel, llvm, linux-hardening
Kees Cook <keescook@chromium.org> wrote:
> Prepare for the coming implementation by GCC and Clang of the __counted_by
> attribute. Flexible array members annotated with __counted_by can have
> their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
>
> As found with Coccinelle[1], add __counted_by for struct brcmf_fw_request.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Arend van Spriel <aspriel@gmail.com>
> Cc: Franky Lin <franky.lin@broadcom.com>
> Cc: Hante Meuleman <hante.meuleman@broadcom.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: Matthias Brugger <mbrugger@suse.com>
> Cc: Hector Martin <marcan@marcan.st>
> Cc: "Alvin Šipraga" <alsi@bang-olufsen.dk>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: brcm80211-dev-list.pdl@broadcom.com
> Cc: SHA-cyfmac-dev-list@infineon.com
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> Reviewed-by: Matthias Brugger <mbrugger@suse.com>
Patch applied to wireless-next.git, thanks.
45aec443bbb0 wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230915200552.never.642-kees@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-20 11:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:05 [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-20 7:01 ` Matthias Brugger
2023-09-20 11:15 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox