Skip to content

Commit e3eac9f

Browse files
keesjmberg-intel
authored andcommitted
wifi: cfg80211: Annotate struct cfg80211_scan_request with __counted_by
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_scan_request. 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 <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Paolo Abeni <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Jeff Johnson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 7b6d708 commit e3eac9f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/net/cfg80211.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2544,7 +2544,7 @@ struct cfg80211_scan_request {
25442544
struct cfg80211_scan_6ghz_params *scan_6ghz_params;
25452545

25462546
/* keep last */
2547-
struct ieee80211_channel *channels[];
2547+
struct ieee80211_channel *channels[] __counted_by(n_channels);
25482548
};
25492549

25502550
static inline void get_random_mask_addr(u8 *buf, const u8 *addr, const u8 *mask)

0 commit comments

Comments
 (0)