From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADEF1C64EB4 for ; Thu, 17 Aug 2023 21:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355304AbjHQVXu (ORCPT ); Thu, 17 Aug 2023 17:23:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355292AbjHQVXT (ORCPT ); Thu, 17 Aug 2023 17:23:19 -0400 Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E36A83592 for ; Thu, 17 Aug 2023 14:23:05 -0700 (PDT) Received: from eig-obgw-5003a.ext.cloudfilter.net ([10.0.29.159]) by cmsmtp with ESMTP id We1rqwOpgfaVXWkSPqMRrX; Thu, 17 Aug 2023 21:23:05 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id WkSOqUmsUr28JWkSPqtOsB; Thu, 17 Aug 2023 21:23:05 +0000 X-Authority-Analysis: v=2.4 cv=PIQcRNmC c=1 sm=1 tr=0 ts=64de8fb9 a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=WzbPXH4gqzPVN0x6HrNMNA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=UttIx32zK-AA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=stkexhm8AAAA:8 a=J1Y8HTJGAAAA:8 a=1XWaLZrsAAAA:8 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=cm27Pg_UAAAA:8 a=6UV5UrL1aO4bJEFlmkAA:9 a=QEXdDO2ut3YA:10 a=pIW3pCRaVxJDc-hWtpF8:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=AjGcO6oz07-iQ99wixmX: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=ncQPyTanjkgJpvE8Nr60owQtOO2OScUkTrk+xfEuoxE=; b=MEqiqAclgUqEcMW3J/WcZCoDLv cSUNwa4YjIPM+6ylX53i9mrmlWaUYbVgXtuUCVqkSQT4cmkYtnYe1ae/igRwUDkobKXStXDlzRajb Y90B/N79ZUbSDx8ofipZECqQIGUG4rEW9w6BiWa6ucJPG4vzm6WwS6YciWwCg0KZ2VKsnU4dfYtJP UBvlD9WZ1klaJINPFrMrLeSRA+UQe0DiJlYNGw51jQluREAOyzamg2PYq0TA1ieALLQXLl4TEMi2Z XEqo6Z5kr0WiUjZQOxoH0HlYJJ6epgSKsuBd0CjI16Hoyji4Ylyf0GEDvqS5S0QNAwiYN20sWelg8 F16VdpAg==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:46450 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 1qWkSM-001ksK-2H; Thu, 17 Aug 2023 16:23:02 -0500 Message-ID: <343b8571-28e4-665c-7652-15920d91cb4d@embeddedor.com> Date: Thu, 17 Aug 2023 15:24:04 -0600 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 3/7] wifi: cfg80211: Annotate struct cfg80211_mbssid_elems with __counted_by Content-Language: en-US To: Kees Cook , Johannes Berg Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230817211114.never.208-kees@kernel.org> <20230817211531.4193219-3-keescook@chromium.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230817211531.4193219-3-keescook@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 - vger.kernel.org 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: 1qWkSM-001ksK-2H 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]:46450 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 76 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfC3Q1sw9ymFmLDzLVFjo3/7OszYbKHDzfvBIiTOZK1dGvc+BF2pn2PJTSQjWnNNO04DqxyNn06u9uYKkEFWfFzca0qJFTQ3RGnT5tbv02MkREVZxE2tR JK3HlY94p8VcZtq9jukKhdCSSoJRHTjRXriCFOc6PPRiMSA3R30YR1BVQjQgomtleASaZSsDnQPD4JLb6Qnjhehw3e4kDUA5ijJI73FONfo5wpWne2YVeb3n Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org On 8/17/23 15:15, 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 cfg80211_mbssid_elems. > Additionally, since the element count member must be set before accessing > the annotated flexible array member, move its initialization earlier. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Johannes Berg > Cc: "David S. Miller" > Cc: Eric Dumazet > Cc: Jakub Kicinski > Cc: Paolo Abeni > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > include/net/cfg80211.h | 2 +- > net/wireless/nl80211.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index eb73b5af5d04..5c7d091b3925 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -1187,7 +1187,7 @@ struct cfg80211_mbssid_elems { > struct { > const u8 *data; > size_t len; > - } elem[]; > + } elem[] __counted_by(cnt); > }; > > /** > diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c > index 80633e815311..9ba4266368db 100644 > --- a/net/wireless/nl80211.c > +++ b/net/wireless/nl80211.c > @@ -5438,13 +5438,13 @@ nl80211_parse_mbssid_elems(struct wiphy *wiphy, struct nlattr *attrs) > elems = kzalloc(struct_size(elems, elem, num_elems), GFP_KERNEL); > if (!elems) > return ERR_PTR(-ENOMEM); > + elems->cnt = num_elems; > > nla_for_each_nested(nl_elems, attrs, rem_elems) { > elems->elem[i].data = nla_data(nl_elems); > elems->elem[i].len = nla_len(nl_elems); > i++; > } > - elems->cnt = num_elems; > return elems; > } >