aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBenoit Papillault <benoit.papillault@free.fr>2010-01-15 12:21:37 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-28 15:02:37 -0800
commit304cd19e41f6c77c3d307869f15a8bfe2a7408cd (patch)
tree41d13e6a4c0d25b5705e451f12ce22ca0f014c9b /net
parent09e4d0f1f69726615a2c9c5246410ec72b60b09f (diff)
mac80211: check that ieee80211_set_power_mgmt only handles STA interfaces.
commit e5de30c9bf4a39db9f54c4a373470ce65881ade0 upstream. ieee80211_set_power_mgmt is meant for STA interfaces only. Moreover, since sdata->u.mgd.mtx is only initialized for STA interfaces, using this code for any other type of interface (like creating a monitor interface) will result in a oops. Signed-off-by: Benoit Papillault <benoit.papillault@free.fr> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index cca675e2536..fe2d3f8c5ae 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1306,6 +1306,9 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_conf *conf = &local->hw.conf;
+ if (sdata->vif.type != NL80211_IFTYPE_STATION)
+ return -EOPNOTSUPP;
+
if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS))
return -EOPNOTSUPP;