Message ID | 20231006201901.work.278-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp574659vqo; Fri, 6 Oct 2023 13:19:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZir3+dyxLTmN5pAyrBaVfn3zAI04VhyUQmlTYQydwZyEw9+3Si2m7vsgyVHFeUCU2Qpmo X-Received: by 2002:a05:6a20:3d8b:b0:130:d5a:e40e with SMTP id s11-20020a056a203d8b00b001300d5ae40emr10163964pzi.7.1696623580643; Fri, 06 Oct 2023 13:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696623580; cv=none; d=google.com; s=arc-20160816; b=HadtnawP3W7gE+6jW20DwbxxmQtE+FeK06RjHGwsPTxl0aVeY5hMtmLDJzl2/79Bt1 gPRr3w9pxTLjYJYFIIi1l9Z1gGcNHHWUsQIknWerj7QTWiRkryoF1D7Ewi8v+LBiUGB9 vHsKtjBwZOz7xldRoILr7wuS/hIKpsYYy2XkGYmnV0Sp6tcXQaR0ewIc8QM/cinq+Cy1 VmMcgf6NzyxRErWN4YvE7nLAcWgG9jh8VbnDdJIvGjYdpP5XazSBW/UD0vxyclfnEdbS O0FhE73rjja6TY1Ksfsc6KrVLGZrRfd6gvD820JPQscIuvmGIndhMP8FNdRxvxtS24B/ i0yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5f6ytO4v8vRnOLZhCY/GWjs+tAFnZkSFkkdvYDNCuiM=; fh=bsoK1cv3G4+nIVJ2NKnZZNyx+cfslKw8enNiS9mnbco=; b=Mnr/wsK7L+QelevknL+VeKYScSO6viRU9QIgqhH8znX62hdeRsTnMHMr9J6qLtGd3n BKBfjv+ktjdicIq104hdTj2R0k+6myf8UggIaqqbWeeV55jHQskHYtazRzHGq4xf0bfK 8AyWmyb5mu4AI7llBuPvpZ4R58YkucQGq67OxfhTye2UoFWcPMlrQh8RLKm1QJju+Wqd UReUxgzLn7SBu0fJc0prbkzMHvDzvyAKdSvSzhlIavLY5wVVT0KgFMHDFZs/MHYTYPYe wJTLTfDdIkGgg4NsF064SDhmWIG93QNNjg/6sieqO1RS7gDyNorhZObdqoulxmI9821m h/tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TaI8cg10; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bo12-20020a056a000e8c00b00690bc2ac50asi1046661pfb.246.2023.10.06.13.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 13:19:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TaI8cg10; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 92693823575F; Fri, 6 Oct 2023 13:19:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233466AbjJFUTZ (ORCPT <rfc822;ezelljr.billy@gmail.com> + 18 others); Fri, 6 Oct 2023 16:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233445AbjJFUTX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 6 Oct 2023 16:19:23 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94AF5181 for <linux-kernel@vger.kernel.org>; Fri, 6 Oct 2023 13:19:04 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1c6219307b2so18914905ad.1 for <linux-kernel@vger.kernel.org>; Fri, 06 Oct 2023 13:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696623544; x=1697228344; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5f6ytO4v8vRnOLZhCY/GWjs+tAFnZkSFkkdvYDNCuiM=; b=TaI8cg108Z+FMYXbLmtGXzt85khSvCQ8ZqpzT3S5C0ne8ixhqMJ7RNhBEtYJHOeydC YJcsNxvGlw2FmWA+n5cB6Qm+GrbrNTNCxBCD7TICWsP7rViIvVK03P/rb40VesaRN+RC IcKZYsz7m2dcT5K6DXy5FgJ7Zr8XXln/ZZNOY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696623544; x=1697228344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5f6ytO4v8vRnOLZhCY/GWjs+tAFnZkSFkkdvYDNCuiM=; b=NBLhjOWS3ffH8q0M5gZj0bRkJAY76PxUHVN7pBS3uPhc692MCP+rhdTRKJhk51PiDU 6u0+XdlVsziEfswGRzdaZazeJGrBUx+6BgHdM4Vq4VTqdPcuWiS9c5B0667XNiZFx1vM e91DRz2FnDOMBDKltnXVoAedBR5LXXM8h2pM/2DVVnghqcUx9OXuPw5zBDGxqgFYWEmL HbBA13Fsd/bQDhChAg5u5AGv/wixWelLkD+BVRKMojGUy+aFwM4eJqllcnL0Zr2ORRnZ K3hPQFPI2UQTa87yPYBi8j4zLuUY7lbWSkwFk6GtkN9t0x0oxixPtVc+6BIjVlcNTSSK /qxQ== X-Gm-Message-State: AOJu0YyM3L+3e1pxJrIiy0Yyfhj7OxWKh7GLe0GHozA22PVInY1YsRIr 27gTenVdCnwQ/qpr/ayXFLisUw== X-Received: by 2002:a17:903:1245:b0:1c4:4dbc:92bc with SMTP id u5-20020a170903124500b001c44dbc92bcmr10579883plh.16.1696623543892; Fri, 06 Oct 2023 13:19:03 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id a12-20020a170902ee8c00b001acae9734c0sm4331895pld.266.2023.10.06.13.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 13:19:03 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: Kalle Valo <kvalo@kernel.org> Cc: Kees Cook <keescook@chromium.org>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, linux-wireless@vger.kernel.org, linux-hardening@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Tom Rix <trix@redhat.com>, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] wifi: intersil: hostap: Annotate struct prism2_download_data with __counted_by Date: Fri, 6 Oct 2023 13:19:02 -0700 Message-Id: <20231006201901.work.278-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1293; i=keescook@chromium.org; h=from:subject:message-id; bh=TKH2rwBEryE3wL9UTdezXy/1pyU6gGSThNovHiWR+yA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlIGu2xaMzE8hOMdtfFrRZu2+Af9UD+Je6xgVdx MTm5JiaiHGJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZSBrtgAKCRCJcvTf3G3A Ju49EACitXCernnFJ9biGqz8FuXcSt+CYk4lCp82ncDmztIE7w8s7PrVYr3qyIXD5St+yemEvIY 8+TFJqHuSJ+paWaoNHAhsxTg1r09JWvOimJUZ3ElMl6n/Bd8/pxwY1ZHbmnlgOkLvs8+kXiYhfN /6++V7c10DTQExTdfUBlANEEoIZ8mQdJEHPv6sbSbxYOFYQeKo4XW3BxYi9WU4g1JcCmoRSNQB3 /k0E9TD8cAbbKU8FvNLEMCG9ME9FlhoA9yskpT6t7sTt4eBqzc1XNpXHTEnqwn9kHsRmi2WaUui vCgEF5gre80jNXK/sNllBjTiVbWYgBw3dyX1ghrHZMJmec97kDFi+IDdwdp9X68JKFcIqwEdM0i eJROy9QnWw9Rqo9gH+mfkop6wvtjTIlAfOTHlRzMvS+rIXhZAdMu/q88krRTEI4Q39mFJnxOuCE gOHoMiSxFoo+Lk8jQ4psIWfiq616RjfdOkBeWatRJ1SXz5clGVKm/GIjrmAUNUfQQ03Tnnj08W3 YQzgJWjH7EcBu0Yi0xiAELx8XW4MBy1Dn+rlcWlyOXyMd0J0W3M0iPxQD0ttRrhHVa/pILy9THj ACXphBwkKUpFySPa87ZUKJkkZETjbhD+ROuipwdrpc9vCOeiP22iA6esHKK6LteyO+UPePjIBJE ouK1x0v ulZR6wig== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 13:19:38 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779038767554200632 X-GMAIL-MSGID: 1779038767554200632 |
Series |
wifi: intersil: hostap: Annotate struct prism2_download_data with __counted_by
|
|
Commit Message
Kees Cook
Oct. 6, 2023, 8:19 p.m. UTC
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 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
prism2_download_data.
Cc: Kalle Valo <kvalo@kernel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: linux-hardening@vger.kernel.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 10/6/23 22:19, 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 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 > prism2_download_data. > > Cc: Kalle Valo <kvalo@kernel.org> > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > Cc: linux-wireless@vger.kernel.org > Cc: linux-hardening@vger.kernel.org > Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] > Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Thanks! -- Gustavo > --- > drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intersil/hostap/hostap_wlan.h b/drivers/net/wireless/intersil/hostap/hostap_wlan.h > index c25cd21d18bd..f71c0545c0be 100644 > --- a/drivers/net/wireless/intersil/hostap/hostap_wlan.h > +++ b/drivers/net/wireless/intersil/hostap/hostap_wlan.h > @@ -617,7 +617,7 @@ struct prism2_download_data { > u32 addr; /* wlan card address */ > u32 len; > u8 *data; /* allocated data */ > - } data[]; > + } data[] __counted_by(num_areas); > }; > >
diff --git a/drivers/net/wireless/intersil/hostap/hostap_wlan.h b/drivers/net/wireless/intersil/hostap/hostap_wlan.h index c25cd21d18bd..f71c0545c0be 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_wlan.h +++ b/drivers/net/wireless/intersil/hostap/hostap_wlan.h @@ -617,7 +617,7 @@ struct prism2_download_data { u32 addr; /* wlan card address */ u32 len; u8 *data; /* allocated data */ - } data[]; + } data[] __counted_by(num_areas); };