lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: check sta_apply_parameters() return value

Browse Source 
Bail out if sta_apply_parameters() returns an error.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Eliad Peller
2011-12-29 14:41:39 +02:00
committed by John W. Linville
parent c3b5003b62
commit 35b8862369
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/mac80211/cfg.c
View File

@@ -1001,6 +1001,7 @@ static int ieee80211_change_station(struct wiphy *wiphy,
struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_local *local = wiphy_priv(wiphy);
struct sta_info *sta; struct sta_info *sta;
struct ieee80211_sub_if_data *vlansdata; struct ieee80211_sub_if_data *vlansdata;
int err;
mutex_lock(&local->sta_mtx); mutex_lock(&local->sta_mtx);
@@ -1040,7 +1041,11 @@ static int ieee80211_change_station(struct wiphy *wiphy,
ieee80211_send_layer2_update(sta); ieee80211_send_layer2_update(sta);
} }
sta_apply_parameters(local, sta, params); err = sta_apply_parameters(local, sta, params);
if (err) {
mutex_unlock(&local->sta_mtx);
return err;
}
if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) && params->supported_rates) if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) && params->supported_rates)
rate_control_rate_init(sta); rate_control_rate_init(sta);