Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d359bbce authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

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: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 93bc8ac4

net/mac80211/rx.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

	}