KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: fix a null pointer deref when querying station info when rate control is not initialized (#17061)

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41801
This commit is contained in:
Felix Fietkau 2014-07-22 19:05:19 +00:00
parent 2c356c4bb7
commit 1e710a93eb
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
package/kernel/mac80211/patches/300-pending_work.patch
View file

@ -1,3 +1,18 @@
commit 38695a6e5a940e6a524523b88a33916b016fb2a1
Author: Felix Fietkau <nbd@openwrt.org>
Date: Fri Jul 11 12:06:18 2014 +0200
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>
commit c0ee7fa4c0da824ccccc172bf175fb1f86540921 commit c0ee7fa4c0da824ccccc172bf175fb1f86540921
Author: Felix Fietkau <nbd@openwrt.org> Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed Jul 16 18:00:31 2014 +0200 Date: Wed Jul 16 18:00:31 2014 +0200
@ -660,7 +675,7 @@ Date: Mon May 19 21:20:49 2014 +0200
} }
EXPORT_SYMBOL(ieee80211_sta_block_awake); EXPORT_SYMBOL(ieee80211_sta_block_awake);
@@ -1703,3 +1723,137 @@ u8 sta_info_tx_streams(struct sta_info * @@ -1703,3 +1723,140 @@ u8 sta_info_tx_streams(struct sta_info *
return ((ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK) return ((ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
>> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT) + 1; >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT) + 1;
} }
@ -669,12 +684,15 @@ Date: Mon May 19 21:20:49 2014 +0200
+{ +{
+ struct ieee80211_sub_if_data *sdata = sta->sdata; + struct ieee80211_sub_if_data *sdata = sta->sdata;
+ struct ieee80211_local *local = sdata->local; + struct ieee80211_local *local = sdata->local;
+ struct rate_control_ref *ref = local->rate_ctrl; + struct rate_control_ref *ref = NULL;
+ struct timespec uptime; + struct timespec uptime;
+ u64 packets = 0; + u64 packets = 0;
+ u32 thr = 0; + u32 thr = 0;
+ int i, ac; + int i, ac;
+ +
+ if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
+ ref = local->rate_ctrl;
+
+ sinfo->generation = sdata->local->sta_generation; + sinfo->generation = sdata->local->sta_generation;
+ +
+ sinfo->filled = STATION_INFO_INACTIVE_TIME | + sinfo->filled = STATION_INFO_INACTIVE_TIME |