diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2018-12-15 11:03:25 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-12-19 09:41:10 +0100 |
| commit | d359bbce0601c6a19203a4b813a7e3910fcba282 (patch) | |
| tree | f2fd4c1eb80b2164e3d8b5b976fd49032009b4b7 /net | |
| parent | 93bc8ac49e82a329160604556b805b7fa614ff9e (diff) | |
| download | linux-d359bbce0601c6a19203a4b813a7e3910fcba282.tar.gz linux-d359bbce0601c6a19203a4b813a7e3910fcba282.tar.bz2 linux-d359bbce0601c6a19203a4b813a7e3910fcba282.zip | |
mac80211: Properly access radiotap vendor data
The radiotap vendor data might be placed after some other
radiotap elements, and thus when accessing it, need to access
the correct offset in the skb data. Fix the code accordingly.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c90904ce6e99..b33d37186576 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -762,8 +762,12 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb, if (status->flag & RX_FLAG_RADIOTAP_HE_MU) rtap_space += sizeof(struct ieee80211_radiotap_he_mu); + if (status->flag & RX_FLAG_RADIOTAP_LSIG) + rtap_space += sizeof(struct ieee80211_radiotap_lsig); + if (unlikely(status->flag & RX_FLAG_RADIOTAP_VENDOR_DATA)) { - struct ieee80211_vendor_radiotap *rtap = (void *)origskb->data; + struct ieee80211_vendor_radiotap *rtap = + (void *)(origskb->data + rtap_space); rtap_space += sizeof(*rtap) + rtap->len + rtap->pad; } |