wifi: mac80211: Add __counted_by for struct ieee802_11_elems and use struct_size()
authorGustavo A. R. Silva <gustavoars@kernel.org>
Mon, 9 Oct 2023 17:59:41 +0000 (11:59 -0600)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 23 Oct 2023 10:25:01 +0000 (12:25 +0200)
commit9118796dfa67a58d17281e019acab4f651eb8dfa
tree98eb7c1770b412ec26ee5cce287d2be551812979
parent3c8aaaa7557b1e33e6ef95a27a5d8a139dcd0874
wifi: mac80211: Add __counted_by for struct ieee802_11_elems and use struct_size()

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

While there, use struct_size() helper, instead of the open-coded
version, to calculate the size for the allocation of the whole
flexible structure including, of course, the flexible-array member.

This code was found with the help of Coccinelle, and audited and
fixed manually.

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/ZSQ/jcmTAf/PKHg/@work
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ieee80211_i.h
net/mac80211/util.c