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

Commit 605f1a5b authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix radiotap vendor area skipping 



The radiotap vendor area in the skb head must be skipped
and accounted for in a few functions until it is removed.
I missed this in my patch, so a few places use this data
as though it was the 802.11 header, fix these places.

Reported-by: default avatarWojciech Dubowik <Wojciech.Dubowik@neratec.com>
Tested-by: default avatarWojciech Dubowik <Wojciech.Dubowik@neratec.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 77d2ece6

net/mac80211/rx.c

+7 −4
Original line number Diff line number Diff line
@@ -62,13 +62,16 @@ static struct sk_buff *remove_monitor_info(struct ieee80211_local *local, 
static inline int should_drop_frame(struct sk_buff *skb, int present_fcs_len)

{

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr;



	hdr = (void *)(skb->data + status->vendor_radiotap_len);



	if (status->flag & (RX_FLAG_FAILED_FCS_CRC |

			    RX_FLAG_FAILED_PLCP_CRC |

			    RX_FLAG_AMPDU_IS_ZEROLEN))

		return 1;

	if (unlikely(skb->len < 16 + present_fcs_len))

	if (unlikely(skb->len < 16 + present_fcs_len +

				status->vendor_radiotap_len))

		return 1;

	if (ieee80211_is_ctl(hdr->frame_control) &&

	    !ieee80211_is_pspoll(hdr->frame_control) &&
@@ -341,8 +344,8 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb, 
	if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)

		present_fcs_len = FCS_LEN;



	/* make sure hdr->frame_control is on the linear part */

	if (!pskb_may_pull(origskb, 2)) {

	/* ensure hdr->frame_control and vendor radiotap data are in skb head */

	if (!pskb_may_pull(origskb, 2 + status->vendor_radiotap_len)) {

		dev_kfree_skb(origskb);

		return NULL;

	}