From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1D3A101C6 for ; Fri, 15 Sep 2023 20:35:46 +0000 (UTC) Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTP id hAJfqOjWkWU1chFTnqTaCM; Fri, 15 Sep 2023 20:31:55 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id hFTmq20DUOCehhFTnqY61D; Fri, 15 Sep 2023 20:31:55 +0000 X-Authority-Analysis: v=2.4 cv=feK+dmcF c=1 sm=1 tr=0 ts=6504bf3b a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=WzbPXH4gqzPVN0x6HrNMNA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=zNV7Rl7Rt7sA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=pGLkceISAAAA:8 a=Q-fNiiVtAAAA:8 a=VwQbUJbxAAAA:8 a=iox4zFpeAAAA:8 a=20KFwNOVAAAA:8 a=bUQKSiCPAAAA:8 a=cm27Pg_UAAAA:8 a=HvF037n1xESchLcPDVoA:9 a=QEXdDO2ut3YA:10 a=Fp8MccfUoT0GBdDC_Lng:22 a=AjGcO6oz07-iQ99wixmX:22 a=WzC6qhA0u3u7Ye7llzcV:22 a=-fHZXUhsFbuwFN3fwQAr:22 a=xmb-EsYY8bH0VWELuYED:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ue3RszsQVKiUlE896mZUKofmDaDko+ASJefe+MJLC0Q=; b=zqyE1pWntCZDaBefUMJU9F6e4O 3ocB/BFJ7TRrKApwXODwdmtdZoppldQTL3fwl9BqEXcL52+V27OWeaJZv+KwallnkID4T7CRNYvdF kpZ5+SrLArV4itMgovk9o0mnTtliifU+98rM6QMRsylau+quLmDo/TvN3urFTLO7v27QCIvLFVA6S pBkCJOZsRTSep7Sg/wD/H1nBdbSOOsRMW1xlP3/n5UdSSXCPeQ5mL9zq+TXd2cGcM80nGDZK3taSm 7GdbOcS7uENSic8YjYmy9dUZiyVXusnSfncgkNFoKVhEvGHK1ECPZmGyTtK4dBZHYmIEf9GBvQUCo sK/8AzzQ==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:38502 helo=[192.168.15.8]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1qhFTk-002NnT-05; Fri, 15 Sep 2023 15:31:52 -0500 Message-ID: Date: Fri, 15 Sep 2023 14:32:46 -0600 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] wifi: brcmfmac: firmware: Annotate struct brcmf_fw_request with __counted_by Content-Language: en-US To: Kees Cook , Arend van Spriel Cc: Franky Lin , Hante Meuleman , Kalle Valo , Matthias Brugger , Hector Martin , =?UTF-8?Q?Alvin_=c5=a0ipraga?= , Hans de Goede , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, Nathan Chancellor , Nick Desaulniers , Tom Rix , "Russell King (Oracle)" , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230915200552.never.642-kees@kernel.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230915200552.never.642-kees@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - lists.linux.dev X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 187.162.21.192 X-Source-L: No X-Exim-ID: 1qhFTk-002NnT-05 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 187-162-21-192.static.axtel.net ([192.168.15.8]) [187.162.21.192]:38502 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 126 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOiPdpBKzrBBEfoX0fA92h3xPzDOqX41mG2nsXVWfK527PCVqHBmKN5JIsbL+wbVjxqFHlazUpIxlpllcFrvVyFYi748IM2nRwEtoPQ4A7tCdlwC+xeO RqfnyDXNI6eiQ7inSFTGQvKyb3ypFev4ZhqOKegJdjRAxVl2mJnKjzYcw9VSkDQuU/UoUP0WbLmYG24RGRKY50AzVVZTgyVXvbA= 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 > Cc: Franky Lin > Cc: Hante Meuleman > Cc: Kalle Valo > Cc: Matthias Brugger > Cc: Hector Martin > Cc: "Alvin Šipraga" > Cc: Hans de Goede > 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 Reviewed-by: Gustavo A. R. Silva 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 {