diff options
| author | Marco Porsch <marco@cozybit.com> | 2013-03-01 16:01:18 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-01 16:09:41 +0100 |
| commit | 7cbf9d017dbb5e3276de7d527925d42d4c11e732 (patch) | |
| tree | aad788e8252266b5cbeafffce5efece12f7b908b | |
| parent | nl80211: increase wiphy dump size dynamically (diff) | |
| download | linux-7cbf9d017dbb5e3276de7d527925d42d4c11e732.tar.xz linux-7cbf9d017dbb5e3276de7d527925d42d4c11e732.zip | |
mac80211: fix oops on mesh PS broadcast forwarding
Introduced with de74a1d9032f4d37ea453ad2a647e1aff4cd2591
"mac80211: fix WPA with VLAN on AP side with ps-sta".
Apparently overwrites the sdata pointer with non-valid data in
the case of mesh.
Fix this by checking for IFTYPE_AP_VLAN.
Signed-off-by: Marco Porsch <marco@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c592a413bad9..0d74f2459585 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2755,7 +2755,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, cpu_to_le16(IEEE80211_FCTL_MOREDATA); } - sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); if (!ieee80211_tx_prepare(sdata, &tx, skb)) break; dev_kfree_skb_any(skb); |