diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2022-10-13 11:59:16 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com>
| 2022-10-13 11:59:56 +0200 |
| commit | e7ad651c31c5e1289323e6c680be6e582a593b26 (patch) | |
| tree | 7170b192203a8fafc16ccee7ce79d475d8df0272 /net/mac80211/ieee80211_i.h | |
| parent | wifi: ath11k: mac: fix reading 16 bytes from a region of size 0 warning (diff) | |
| parent | wifi: cfg80211: update hidden BSSes to avoid WARN_ON (diff) | |
| download | linux-e7ad651c31c5e1289323e6c680be6e582a593b26.tar.gz linux-e7ad651c31c5e1289323e6c680be6e582a593b26.tar.bz2 linux-e7ad651c31c5e1289323e6c680be6e582a593b26.zip | |
Merge branch 'cve-fixes-2022-10-13'
Pull in the fixes for various scan parsing bugs found by
Sönke Huster by fuzzing.
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 4e1d4c339f2d..a842f2e1c230 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1709,6 +1709,14 @@ struct ieee802_11_elems { /* whether a parse error occurred while retrieving these elements */ bool parse_error; + + /* + * scratch buffer that can be used for various element parsing related + * tasks, e.g., element de-fragmentation etc. + */ + size_t scratch_len; + u8 *scratch_pos; + u8 scratch[]; }; static inline struct ieee80211_local *hw_to_local( |