]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mac80211: fix crash on getting sta info with uninitialized rate control
authorFelix Fietkau <nbd@openwrt.org>
Tue, 22 Jul 2014 19:00:26 +0000 (21:00 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 22 Jul 2014 20:17:17 +0000 (22:17 +0200)
If the expected throughput is queried before rate control has been
initialized, the minstrel op for it will crash while trying to access
the rate table.
Check for WLAN_STA_RATE_CONTROL before attempting to use the rate
control op.

Reported-by: Jean-Pierre Tosoni <jp.tosoni@acksys.fr>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index d7513a503be11b180031342dcf316450fd6c69d3..592f4b152ba8a51e4d1c3b3bc3360286959ff1e0 100644 (file)
@@ -472,12 +472,15 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
        struct ieee80211_local *local = sdata->local;
-       struct rate_control_ref *ref = local->rate_ctrl;
+       struct rate_control_ref *ref = NULL;
        struct timespec uptime;
        u64 packets = 0;
        u32 thr = 0;
        int i, ac;
 
+       if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
+               ref = local->rate_ctrl;
+
        sinfo->generation = sdata->local->sta_generation;
 
        sinfo->filled = STATION_INFO_INACTIVE_TIME |