linux-hardening - Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <3698c731-34fe-b6bf-46be-15146ae209bb@suse.com>
Date:   Wed, 20 Sep 2023 09:01:14 +0200
From:   Matthias Brugger <mbrugger@...e.com>
To:     Kees Cook <keescook@...omium.org>,
        Arend van Spriel <aspriel@...il.com>
Cc:     Franky Lin <franky.lin@...adcom.com>,
        Hante Meuleman <hante.meuleman@...adcom.com>,
        Kalle Valo <kvalo@...nel.org>,
        Hector Martin <marcan@...can.st>,
        Alvin Šipraga <alsi@...g-olufsen.dk>,
        Hans de Goede <hdegoede@...hat.com>,
        linux-wireless@...r.kernel.org,
        brcm80211-dev-list.pdl@...adcom.com,
        SHA-cyfmac-dev-list@...ineon.com,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        Tom Rix <trix@...hat.com>,
        "Russell King (Oracle)" <rmk+kernel@...linux.org.uk>,
        linux-kernel@...r.kernel.org, llvm@...ts.linux.dev,
        linux-hardening@...r.kernel.org
Subject: Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct
 brcmf_fw_request with __counted_by



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@...il.com>
> Cc: Franky Lin <franky.lin@...adcom.com>
> Cc: Hante Meuleman <hante.meuleman@...adcom.com>
> Cc: Kalle Valo <kvalo@...nel.org>
> Cc: Matthias Brugger <mbrugger@...e.com>
> Cc: Hector Martin <marcan@...can.st>
> Cc: "Alvin Šipraga" <alsi@...g-olufsen.dk>
> Cc: Hans de Goede <hdegoede@...hat.com>
> Cc: linux-wireless@...r.kernel.org
> Cc: brcm80211-dev-list.pdl@...adcom.com
> Cc: SHA-cyfmac-dev-list@...ineon.com
> Signed-off-by: Kees Cook <keescook@...omium.org>

Reviewed-by: Matthias Brugger <mbrugger@...e.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 {