2013-11-08 16:31:47

by Felix Fietkau

Subject: [PATCH] mac80211: fix crash when using AP VLAN interfaces

Commit "mac80211: implement SMPS for AP" applies to AP_VLAN as well.
It assumes that sta->sdata->vif.bss_conf.bssid is present, which did not
get set for AP_VLAN.
Initialize it to sdata->vif.addr like for other interface types.

Signed-off-by: Felix Fietkau <[email protected]>
---
net/mac80211/iface.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index ff101ea..36c3a4c 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1325,7 +1325,6 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
sdata->vif.bss_conf.bssid = NULL;
break;
case NL80211_IFTYPE_AP_VLAN:
- break;
case NL80211_IFTYPE_P2P_DEVICE:
sdata->vif.bss_conf.bssid = sdata->vif.addr;
break;
--
1.8.3.4 (Apple Git-47)

2013-11-11 13:56:57

by Johannes Berg

Subject: Re: [PATCH] mac80211: fix crash when using AP VLAN interfaces

On Fri, 2013-11-08 at 17:31 +0100, Felix Fietkau wrote:
> Commit "mac80211: implement SMPS for AP" applies to AP_VLAN as well.
> It assumes that sta->sdata->vif.bss_conf.bssid is present, which did not
> get set for AP_VLAN.
> Initialize it to sdata->vif.addr like for other interface types.

Applied.

It'd be great if you could submit a vlan and 4-addr test to Jouni's
hwsim tests :-)

johannes