Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Message-ID: <3698c731-34fe-b6bf-46be-15146ae209bb@suse.com>
Date:   Wed, 20 Sep 2023 09:01:14 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.14.0
Subject: Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct
 brcmf_fw_request with __counted_by
Content-Language: en-US, ca-ES, es-ES
To:     Kees Cook <keescook@chromium.org>,
        Arend van Spriel <aspriel@gmail.com>
Cc:     Franky Lin <franky.lin@broadcom.com>,
        Hante Meuleman <hante.meuleman@broadcom.com>,
        Kalle Valo <kvalo@kernel.org>,
        Hector Martin <marcan@marcan.st>,
        =?UTF-8?Q?Alvin_=c5=a0ipraga?= <alsi@bang-olufsen.dk>,
        Hans de Goede <hdegoede@redhat.com>,
        linux-wireless@vger.kernel.org,
        brcm80211-dev-list.pdl@broadcom.com,
        SHA-cyfmac-dev-list@infineon.com,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Tom Rix <trix@redhat.com>,
        "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
        linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
        linux-hardening@vger.kernel.org
References: <20230915200552.never.642-kees@kernel.org>
From:   Matthias Brugger <mbrugger@suse.com>
In-Reply-To: <20230915200552.never.642-kees@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZE9oY3FTQUowZ1dObkxza2o5aUI4SXJJWVlQRk5PRW9SOWtRY1lPWG9lUWt1?=
 =?utf-8?B?MHNaM1VRQUUwMjRCamN3RG5oUER6MHI3blcrS1NPV2RhVllQZ2FhRWVybm8x?=
 =?utf-8?B?WlBuMGYzaGdiMkU1R09rOXlHR0hUMVdRUGJ0U29aL2d0T2FybkR5T3Vrd2hK?=
 =?utf-8?B?am52S3ZmOTRFOUthM2paVFNHd2RDb1ppdHhkbFZyL3lxTjlJaWk1azFhVGgy?=
 =?utf-8?B?WFBpNHFwbWR1VUF1TEZpQ0tRQ3Bpcnp3MHczQmFCK3lQZjVDSFoxQzVtVkVh?=
 =?utf-8?B?R2VyU0lrOHpvdDNCQndCbWlRU3hKN01wYkl6c2ZyNzFDczNDbXd3SjZtYTU4?=
 =?utf-8?B?Y0hUVGRnMUhLMVNoSUlhSnVTaERtL3gvaHBNc1M4eTlPbU9XZmZkSmhIZENL?=
 =?utf-8?B?b1FHUE8xMjdnWWtXc0lDS05HNnFVK2N4RlFGZ01UbEF1TGxiS2NHVC9WN0ht?=
 =?utf-8?B?ek40S1I2NjhLUDlJZ2hUV2JhY01Ncjh3c0c5dXBjeStGMElzU2hCc0ZJZmN2?=
 =?utf-8?B?MlR2U0hxc2RTdHlqQ29SQ3ZsNkxUYms5M0l1cU5vRUZsV0tPU05McFhOZ3ZE?=
 =?utf-8?B?eVBTQzZ3NER3V2ZkSVFFcGIxeHQxVkdWSGJZZ0RiRzdrSy9jL2djZU8rRTIz?=
 =?utf-8?B?MERCSG5DMGNEQktCNWtEWGcvRlR0YlNITkVsZjd6U0NrYzRPNXNXZmZHZlBQ?=
 =?utf-8?B?V1NhWS9VMmIrUEZqTDJwbVBrNDFHenVhWmV6dVVzbHdxVkN6N2NzcSs1Y3h2?=
 =?utf-8?B?c0FQaThOKysyNFhjZzlqM2l1OC8zeUlpWHVWenY0azkrdUZ5SWRlSEZ1aGty?=
 =?utf-8?B?VlFuTnNyN0w2VEpwOWkzeEFPQU9qM0xHNXJteFYwVXl6MTNyNlR1eXpOZm00?=
 =?utf-8?B?WitDdTNkRGNWTS9DSEUwcjc3aTh3QStQaFZhanJuNHJsQ3l3dWxnaUQrUWgy?=
 =?utf-8?B?cVkyUDZvejQ2eGhnZzlRelEvbWJQNW9BZVZmNFZGd285ZGU5MmJsK3h5dDZy?=
 =?utf-8?B?R3ZrWklYL3hsZXByQjhNcWNvb0NCbkROdDBsMFBoQ2hVUU42V2NORmlQdFJr?=
 =?utf-8?B?WEJMK3FhQzNMKzFNTDNjb1R2UlhLajR1NWxiN0dCc0ZVL0NvU2o3QWRBMEZv?=
 =?utf-8?B?M2R1SDAxaGdFUXV3emNNNXhiYTNzVDBFQ01TUUlMTjVJT3VoQm44MGNka0lC?=
 =?utf-8?B?VHAycFZVazd6dHR2a0Q2eW12aCsxaDkzZWd6c0ZNTmNQM0hUUU9VZ0Z4bFJB?=
 =?utf-8?B?RGN0WTRoOFN0cTNsSWtNelYxeHJuZTBaK1NjblB6bTY4cEViaERqenp6cCt0?=
 =?utf-8?B?eWdKMFdBUllEa0l4UUwxV0FkNkRnYTd0dXdTZnNlZjNzWTYybVprVlp3S0Y0?=
 =?utf-8?B?MmtjZkduKzc0Nk5qdlpxMjJodk1JVEZIUDc0UDdZQ0VkOWpXWXNheUhGeTVV?=
 =?utf-8?B?N2ZVMU4xTFR0NFFid05KQURVQ1N1NUJiVTVSbzlZTlUraTNBRGwrRldRV0JS?=
 =?utf-8?B?c2d2MWxvY1pZNzE3M2VpdVpMcVlIUlUrN0lwei9FTEo0ZVRDOG8xakZ5VUdl?=
 =?utf-8?B?M1dSZWhvK2hnUkhDakpjbWJtTjVHNko3LzlZdXcvUEJEcUY2TlRrOHQzcXlF?=
 =?utf-8?B?eHJxWTk1QjZ2elIyT0M3VXR5MG1XdE10N3VXLzBWTlhSYnNUMTl4c3VNVXRM?=
 =?utf-8?B?RzNoaTJoeURZZzd0LzFYSHBpQUVobm9vTm9Tcll0S2kxT3JodWJOd3k4UTFF?=
 =?utf-8?B?ZmpaOFQ0Z2Nyazd4anI2cVN4SzVFL2hKTGNtNUZSV2xnREpEQ0wwN3VpTlVR?=
 =?utf-8?B?WkRrM2NiK05UNjF6WHM5d2QzQm92QVdNTEptL3NQcXI3V0xoN2xYRFMwQVdV?=
 =?utf-8?B?bjVKSjNLRXFBcXVhMDhJWUJCeXdLMnhPSVlqZGpCbXdHbmwwSE40S1pQcGZi?=
 =?utf-8?B?c2tPU0k2Qy9SY3pLOExQWmN4eHAvQkhTb2tSM2FTdEgvTGJEYlMxaVdvRDla?=
 =?utf-8?B?RHVIMDVaam8rcVMzaTBabWRQd094NGlMczJmd2ZiK1NDZzNDT1RsKzJvVksr?=
 =?utf-8?B?WVhlV1l3TWUwYmhxeW1wS2xMS0ZRRmV1TmlGcHM4aUltNW5QbE1VSDQ1M1dU?=
 =?utf-8?Q?Yw9YUXEZlOikG/ExwDt2IgfH6?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ca4aea40-514e-4af7-cc9b-08dbb9a76277
X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6432.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 07:01:17.0019
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lF4MSzCSHkXBFMaSVDJ7x7ZYuMuPH4pK8U//EUpWps3Wzp5P49eeCf4LPN9RMd0k/7vkGGzjMMzfbGtQ3Vkb0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7927
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 20 Sep 2023 00:01:34 -0700 (PDT)


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 {