Commit 3f0e0b22 authored Jan 08, 2010 by Felix Fietkau Committed by John W. Linville Jan 12, 2010

mac80211: do not transmit frames on unconfigured 4-addr vlan interfaces



If frames are transmitted on 4-addr ap vlan interfaces with no station,
they end up being transmitted unencrypted, even if the ap interface
uses WPA. This patch add some sanity checking to make sure that this
does not happen.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 0e5ded5a

net/mac80211/tx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1056,8 +1056,11 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,

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

		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
		tx->sta = rcu_dereference(sdata->u.vlan.sta);
		if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
		return TX_DROP;
		}
		if (!tx->sta)
		tx->sta = sta_info_get(sdata, hdr->addr1);

Admin message