wifi: cfg80211: Annotate struct cfg80211_tid_config with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 17 Aug 2023 21:15:29 +0000 (14:15 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 22 Aug 2023 11:18:16 +0000 (13:18 +0200)
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_tid_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>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Link: https://lore.kernel.org/r/20230817211531.4193219-7-keescook@chromium.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/cfg80211.h

index a2afc94..423fe9b 100644 (file)
@@ -811,7 +811,7 @@ struct cfg80211_tid_cfg {
 struct cfg80211_tid_config {
        const u8 *peer;
        u32 n_tid_conf;
-       struct cfg80211_tid_cfg tid_conf[];
+       struct cfg80211_tid_cfg tid_conf[] __counted_by(n_tid_conf);
 };
 
 /**