2010-01-15 00:50:28

by Benoit Papillault

[permalink] [raw]
Subject: [PATCH] mac80211: check that ieee80211_set_power_mgmt only handles STA interfaces.

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 IBSS) will result in a
oops.

Signed-off-by: Benoit Papillault <[email protected]>
---
net/mac80211/cfg.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8286df5..c9de4e3 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1382,6 +1382,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 0;
+
if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS))
return -EOPNOTSUPP;

--
1.6.3.3