commit 034d655ee7b79a2f48ba4c2b620d2864a6e0aa14
author Johannes Berg <johannes@sipsolutions.net> Wed May 27 10:35:29 2009 +0200
committer John W. Linville <linville@tuxdriver.com> Wed Jun 03 14:05:10 2009 -0400
tree 69d3231f9eb072f75129b9ae90d2d1b9ab63062f
parent 7ba10a8efe501e26d995aa9b6dc13395518a87e4

cfg80211: disallow interfering with stations on non-AP (part 2)

On non-AP interfaces userspace has no business interfering with
the station management, this can confuse mac80211 (and other
drivers probably wouldn't support it anyway). Allow adding and
removing stations only on AP interfaces.

(Reconcile this w/ previous version of patch posted with same
subject... -- JWL)

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/wireless/nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 909ebd6..fd392ff 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1687,6 +1687,12 @@
 	if (err)
 		goto out_rtnl;
 
+	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
+	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {
+		err = -EINVAL;
+		goto out;
+	}
+
 	err = get_vlan(info->attrs[NL80211_ATTR_STA_VLAN], drv, &params.vlan);
 	if (err)
 		goto out;