Commit fa8f136f authored Jul 22, 2014 by Felix Fietkau Committed by Johannes Berg Jul 22, 2014

mac80211: fix crash on getting sta info with uninitialized rate control



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>

parent 8c26d458

net/mac80211/cfg.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 \|

Admin message