浏览代码

ath10k: protect ath10k_htt_rx_ring_free with rx_ring.lock

While debugging driver crashes related to a buggy firmware
crashing under load, I noticed that ath10k_htt_rx_ring_free
could be called without being under lock.  I'm not sure if this
is the root cause of the crash or not, but it seems prudent to
protect it.

Originally tested on 4.16+ kernel with ath10k-ct 10.4 firmware
running on 9984 NIC.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Ben Greear 7 年之前
父节点
当前提交
168f75f11f
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/net/wireless/ath/ath10k/htt_rx.c

+ 4 - 1
drivers/net/wireless/ath/ath10k/htt_rx.c

@@ -268,11 +268,12 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)
 	spin_lock_bh(&htt->rx_ring.lock);
 	spin_lock_bh(&htt->rx_ring.lock);
 	ret = ath10k_htt_rx_ring_fill_n(htt, (htt->rx_ring.fill_level -
 	ret = ath10k_htt_rx_ring_fill_n(htt, (htt->rx_ring.fill_level -
 					      htt->rx_ring.fill_cnt));
 					      htt->rx_ring.fill_cnt));
-	spin_unlock_bh(&htt->rx_ring.lock);
 
 
 	if (ret)
 	if (ret)
 		ath10k_htt_rx_ring_free(htt);
 		ath10k_htt_rx_ring_free(htt);
 
 
+	spin_unlock_bh(&htt->rx_ring.lock);
+
 	return ret;
 	return ret;
 }
 }
 
 
@@ -284,7 +285,9 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
 	skb_queue_purge(&htt->rx_in_ord_compl_q);
 	skb_queue_purge(&htt->rx_in_ord_compl_q);
 	skb_queue_purge(&htt->tx_fetch_ind_q);
 	skb_queue_purge(&htt->tx_fetch_ind_q);
 
 
+	spin_lock_bh(&htt->rx_ring.lock);
 	ath10k_htt_rx_ring_free(htt);
 	ath10k_htt_rx_ring_free(htt);
+	spin_unlock_bh(&htt->rx_ring.lock);
 
 
 	dma_free_coherent(htt->ar->dev,
 	dma_free_coherent(htt->ar->dev,
 			  ath10k_htt_get_rx_ring_size(htt),
 			  ath10k_htt_get_rx_ring_size(htt),