diff options
| author | Kees Cook <keescook@chromium.org> | 2021-08-07 00:53:05 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-08-13 10:58:25 +0300 |
| commit | 8c89f7b3d3f2880c57b0bc96c72ccd98fe354399 (patch) | |
| tree | 071abf84b4bde5a46a6fecd9473cbaa3ce4e8fee /include/net/ieee80211_radiotap.h | |
| parent | 5cafd3784a738eab8bbfcda17e8571050794ef32 (diff) | |
| download | linux-8c89f7b3d3f2880c57b0bc96c72ccd98fe354399.tar.xz | |
mac80211: Use flex-array for radiotap header bitmap
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally writing across neighboring fields.
The it_present member of struct ieee80211_radiotap_header is treated as a
flexible array (multiple u32s can be conditionally present). In order for
memcpy() to reason (or really, not reason) about the size of operations
against this struct, use of bytes beyond it_present need to be treated
as part of the flexible array. Add a trailing flexible array and
initialize its initial index via pointer arithmetic.
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210806215305.2875621-1-keescook@chromium.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/ieee80211_radiotap.h')
| -rw-r--r-- | include/net/ieee80211_radiotap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h index c0854933e24f..11630351c978 100644 --- a/include/net/ieee80211_radiotap.h +++ b/include/net/ieee80211_radiotap.h @@ -43,6 +43,11 @@ struct ieee80211_radiotap_header { * @it_present: (first) present word */ __le32 it_present; + + /** + * @it_optional: all remaining presence bitmaps + */ + __le32 it_optional[]; } __packed; /* version is always 0 */ |