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

Commit 94ba998b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2017-01-02' of... 

Merge tag 'mac80211-for-davem-2017-01-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A single fix to avoid loading an skb->cb pointer too early.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eb7903bb 35f432a0

net/mac80211/tx.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3287,7 +3287,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, 
	int extra_head = fast_tx->hdr_len - (ETH_HLEN - 2);

	int extra_head = fast_tx->hdr_len - (ETH_HLEN - 2);

	int hw_headroom = sdata->local->hw.extra_tx_headroom;

	int hw_headroom = sdata->local->hw.extra_tx_headroom;

	struct ethhdr eth;

	struct ethhdr eth;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *info;

	struct ieee80211_hdr *hdr = (void *)fast_tx->hdr;

	struct ieee80211_hdr *hdr = (void *)fast_tx->hdr;

	struct ieee80211_tx_data tx;

	struct ieee80211_tx_data tx;

	ieee80211_tx_result r;

	ieee80211_tx_result r;
@@ -3351,6 +3351,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, 
	memcpy(skb->data + fast_tx->da_offs, eth.h_dest, ETH_ALEN);

	memcpy(skb->data + fast_tx->da_offs, eth.h_dest, ETH_ALEN);

	memcpy(skb->data + fast_tx->sa_offs, eth.h_source, ETH_ALEN);

	memcpy(skb->data + fast_tx->sa_offs, eth.h_source, ETH_ALEN);





	info = IEEE80211_SKB_CB(skb);

	memset(info, 0, sizeof(*info));

	memset(info, 0, sizeof(*info));

	info->band = fast_tx->band;

	info->band = fast_tx->band;

	info->control.vif = &sdata->vif;

	info->control.vif = &sdata->vif;