ath11k: Fix NULL pointer dereference in sta_statistics() callback
PATCH 1/1 ath11k: Fix NULL pointer dereference in sta_statistics() callback
It is possible to dereference NULL arsta->rx_stats memory to get rssi information after STA disconnection. Instead of dereferencing a memory which is allocated/freed in sta_state() callback, add a new member for rssi in arsta itself and use it in sta_statistics().
ath11k c000000.wifi1: Station 8c:fd:f0:0a:90:f3 moved to disassociated state ath11k c000000.wifi1: Removed peer: 8c:fd:f0:0a:90:f3 for VDEV: 0 Unable to handle kernel NULL pointer dereference at virtual address 00000218 Internal error: Oops: 5 [#1] PREEMPT SMP ARM PC is at ath11k_sta_statistics+0x90/0xa0 [ath11k] LR is at sta_set_sinfo+0xb8/0xcb4 [mac80211]
Fixes ecdb3adeda5c ("ath11k: Fix Rx signal strength reporting")
Reported-by Pradeep Kumar Chitrapu <[email protected]>
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath11k/core.h | 2 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- drivers/net/wireless/ath/ath11k/mac.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +1 -1
@@ -237,7 +237,6 @@ struct ath11k_rx_peer_stats {u64 tid_count[IEEE80211_NUM_TIDS +1 ];u64 pream_cnt[HAL_RX_PREAMBLE_MAX ];u64 reception_type[HAL_RX_RECEPTION_TYPE_MAX ]; -u32 rssi_comb; };#define ATH11K_HE_MCS_NUM 12
@@ -330,6 +329,7 @@ struct ath11k_sta {struct rate_info txrate;struct rate_info last_txrate;u64 rx_duration; +u8 rssi_comb;struct ath11k_htt_tx_stats *tx_stats;struct ath11k_rx_peer_stats *rx_stats; };
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -1
@@ -2373,7 +2373,7 @@ static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta, rx_stats->num_mpdu_fcs_ok += ppdu_info->num_mpdu_fcs_ok; rx_stats->num_mpdu_fcs_err += ppdu_info->num_mpdu_fcs_err; - rx_stats->rssi_comb = ppdu_info->rssi_comb; + arsta->rssi_comb = ppdu_info->rssi_comb; } static struct sk_buff *ath11k_dp_rx_alloc_mon_status_buf(struct ath11k_base *ab,
drivers/net/wireless/ath/ath11k/mac.c +1 -1
@@ -5110,7 +5110,7 @@ static void ath11k_sta_statistics(struct ieee80211_hw *hw, sinfo->filled |=BIT_ULL (NL80211_STA_INFO_TX_BITRATE );/* TODO: Use real NF instead of default one. */ - sinfo->signal = arsta->rx_stats->rssi_comb +ATH11K_DEFAULT_NOISE_FLOOR ; + sinfo->signal = arsta->rssi_comb +ATH11K_DEFAULT_NOISE_FLOOR ; }static const struct ieee80211_ops ath11k_ops = {
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 12 lines · Vasanthakumar Thiagarajan
It is possible to dereference NULL
arsta->rx_statsmemory to get rssi information after STA disconnection. Instead of dereferencing a memory which is allocated/freed insta_state()callback, add a new member for rssi in arsta itself and use it insta_statistics().ath11k c000000.wifi1: Station 8c:fd:f0:0a:90:f3 moved to disassociated state ath11k c000000.wifi1: Removed peer: 8c:fd:f0:0a:90:f3 for VDEV: 0 Unable to handle kernel NULL pointer dereference at virtual address 00000218 Internal error: Oops: 5 [#1] PREEMPT SMP ARM PC is at ath11k_sta_statistics+0x90/0xa0 [ath11k] LR is at sta_set_sinfo+0xb8/0xcb4 [mac80211]
Quoted 4 lines
Fixes ecdb3adeda5c ("ath11k: Fix Rx signal strength reporting")Reported-by Pradeep Kumar Chitrapu <[email protected]>Signed-off-by Vasanthakumar Thiagarajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
38934d6b0c2c ath11k: Fix NULL pointer dereference in sta_statistics() callback
Signature · 9 lines
https://patchwork.kernel.org/patch/11014709/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k