wifi: cfg80211: use __counted_by where appropriate

Annotate 'sub_specs' of 'struct cfg80211_sar_specs', 'channels'
of 'struct cfg80211_sched_scan_request', 'channels' of 'struct
cfg80211_wowlan_nd_match', and 'matches' of 'struct
cfg80211_wowlan_nd_info' with '__counted_by' attribute. Briefly
tested with clang 18.1.1 and CONFIG_UBSAN_BOUNDS running iwlwifi.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://msgid.link/20240517153332.18271-1-dmantipov@yandex.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index cbf1664dc569cdc2bda51164d21e2f5afb18edb0..d79180bec7a1f27420d985970535a0dfb290746b 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2200,7 +2200,7 @@ struct cfg80211_sar_sub_specs {
 struct cfg80211_sar_specs {
        enum nl80211_sar_type type;
        u32 num_sub_specs;
-       struct cfg80211_sar_sub_specs sub_specs[];
+       struct cfg80211_sar_sub_specs sub_specs[] __counted_by(num_sub_specs);
 };
 
 
@@ -2838,7 +2838,7 @@ struct cfg80211_sched_scan_request {
        struct list_head list;
 
        /* keep last */
-       struct ieee80211_channel *channels[];
+       struct ieee80211_channel *channels[] __counted_by(n_channels);
 };
 
 /**
@@ -3582,7 +3582,7 @@ struct cfg80211_coalesce {
 struct cfg80211_wowlan_nd_match {
        struct cfg80211_ssid ssid;
        int n_channels;
-       u32 channels[];
+       u32 channels[] __counted_by(n_channels);
 };
 
 /**
@@ -3596,7 +3596,7 @@ struct cfg80211_wowlan_nd_match {
  */
 struct cfg80211_wowlan_nd_info {
        int n_matches;
-       struct cfg80211_wowlan_nd_match *matches[];
+       struct cfg80211_wowlan_nd_match *matches[] __counted_by(n_matches);
 };
 
 /**