linux-hardening - Re: [PATCH] wifi: brcmfmac: Annotate struct brcmf_gscan_config 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]

Date:   Fri, 15 Sep 2023 14:17:39 -0600
From:   "Gustavo A. R. Silva" <gustavo@...eddedor.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>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Hector Martin <marcan@...can.st>,
        Ryohei Kondo <ryohei.kondo@...ress.com>,
        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>,
        Linus Walleij <linus.walleij@...aro.org>,
        linux-kernel@...r.kernel.org, llvm@...ts.linux.dev,
        linux-hardening@...r.kernel.org
Subject: Re: [PATCH] wifi: brcmfmac: Annotate struct brcmf_gscan_config with
 __counted_by



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_gscan_config.
> 
> [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: "Gustavo A. R. Silva" <gustavoars@...nel.org>
> Cc: Hector Martin <marcan@...can.st>
> Cc: Ryohei Kondo <ryohei.kondo@...ress.com>
> 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: Gustavo A. R. Silva <gustavoars@...nel.org>

Thanks
--
Gustavo

> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> index bece26741d3a..6eef6bc430e2 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> @@ -1209,7 +1209,7 @@ struct brcmf_gscan_config {
>   	u8 count_of_channel_buckets;
>   	u8 retry_threshold;
>   	__le16  lost_ap_window;
> -	struct brcmf_gscan_bucket_config bucket[];
> +	struct brcmf_gscan_bucket_config bucket[] __counted_by(count_of_channel_buckets);
>   };
>   
>   /**