mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Kees Cook <keescook@chromium.org>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	linux-wireless@vger.kernel.org, netdev@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,
	linux-hardening@vger.kernel.org
Subject: [PATCH 2/7] wifi: cfg80211: Annotate struct cfg80211_cqm_config with __counted_by
Date: Thu, 17 Aug 2023 14:15:24 -0700	[thread overview]
Message-ID: <20230817211531.4193219-2-keescook@chromium.org> (raw)
In-Reply-To: <20230817211114.never.208-kees@kernel.org>

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_cqm_config.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 net/wireless/core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 8a807b609ef7..507d184b8b40 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -298,7 +298,7 @@ struct cfg80211_cqm_config {
 	u32 rssi_hyst;
 	s32 last_rssi_event_value;
 	int n_rssi_thresholds;
-	s32 rssi_thresholds[];
+	s32 rssi_thresholds[] __counted_by(n_rssi_thresholds);
 };
 
 void cfg80211_destroy_ifaces(struct cfg80211_registered_device *rdev);
-- 
2.34.1


  parent reply	other threads:[~2023-08-17 21:16 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-17 21:15 [PATCH 0/7] wifi: cfg80211: Annotate " Kees Cook
2023-08-17 21:15 ` [PATCH 1/7] wifi: cfg80211: Annotate struct cfg80211_acl_data " Kees Cook
2023-08-17 21:21   ` Justin Stitt
2023-08-17 21:23   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` Kees Cook [this message]
2023-08-17 21:23   ` [PATCH 2/7] wifi: cfg80211: Annotate struct cfg80211_cqm_config " Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` [PATCH 3/7] wifi: cfg80211: Annotate struct cfg80211_mbssid_elems " Kees Cook
2023-08-17 21:24   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` [PATCH 4/7] wifi: cfg80211: Annotate struct cfg80211_pmsr_request " Kees Cook
2023-08-17 21:24   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` [PATCH 5/7] wifi: cfg80211: Annotate struct cfg80211_rnr_elems " Kees Cook
2023-08-17 21:24   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` [PATCH 6/7] wifi: cfg80211: Annotate struct cfg80211_scan_request " Kees Cook
2023-08-17 21:24   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson
2023-08-17 21:15 ` [PATCH 7/7] wifi: cfg80211: Annotate struct cfg80211_tid_config " Kees Cook
2023-08-17 21:24   ` Gustavo A. R. Silva
2023-08-17 22:03   ` Jeff Johnson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230817211531.4193219-2-keescook@chromium.org \
    --to=keescook@chromium.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=johannes@sipsolutions.net \
    --cc=kuba@kernel.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=trix@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®