[PATCH v2 3/5] wifi: ath11k: avoid IDR mutation during vif mgmt TX cleanup

[Rameshkumar Sundaram]

On 10/3/2026 2:51 PM, Jiale Yao wrote:
> ath11k_mac_op_remove_interface() walks txmgmt_idr with idr_for_each(),
> and its callback removes each entry belonging to the interface. Removing
> the current entry can invalidate the radix-tree iterator retained by
> idr_for_each().
> 
> Move the walk into a helper that uses idr_for_each_entry(). It performs a
> fresh lookup for every iteration, so each matching entry can be removed
> through the locked removal helper without retaining iterator state across
> the removal.
> 
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Jiale Yao <yaojiale02 at 163.com>
> ---
>   drivers/net/wireless/ath/ath11k/mac.c | 21 +++++++++++----------
>   1 file changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index f9af403a2f0d..e7ece258f142 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -6176,16 +6176,18 @@ void ath11k_mac_tx_mgmt_pending_free(struct ath11k *ar)
>   		ath11k_mac_tx_mgmt_free(ar, buf_id);
>   }
>   
> -static int ath11k_mac_vif_txmgmt_idr_remove(int buf_id, void *skb, void *ctx)
> +static void ath11k_mac_vif_txmgmt_cleanup(struct ath11k *ar,
> +					  struct ieee80211_vif *vif)
>   {
> -	struct ieee80211_vif *vif = ctx;
> -	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB((struct sk_buff *)skb);
> -	struct ath11k *ar = skb_cb->ar;
> -
> -	if (skb_cb->vif == vif)
> -		ath11k_mac_tx_mgmt_free(ar, buf_id);
> +	struct ath11k_skb_cb *skb_cb;
> +	struct sk_buff *skb;
> +	int buf_id;
>   
> -	return 0;
> +	idr_for_each_entry(&ar->txmgmt_idr, skb, buf_id) {
> +		skb_cb = ATH11K_SKB_CB(skb);


The skb dereference here appears unsafe. A parallel WMI TX completion 
path can remove the entry from txmgmt_idr and free the skb while the IDR 
is being iterated, leading to a potential UAF when accessing skb_cb->vif.

Would it make sense to hold txmgmt_idr_lock for the duration of the 
iteration and remove the locking from ath11k_mac_tx_mgmt_free()? 
ath11k_mac_tx_mgmt_pending_free() could take the same lock as well.

This looks like a pre-existing issue rather than something introduced by 
this change, so I'm fine with fixing it in a follow-up patch if preferred.


> +		if (skb_cb->vif == vif)
> +			ath11k_mac_tx_mgmt_free(ar, buf_id);
> +	}
>   }
>   
>   static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif,
> @@ -7416,8 +7418,7 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,
>   
>   	ath11k_peer_cleanup(ar, arvif->vdev_id);
>   
> -	idr_for_each(&ar->txmgmt_idr,
> -		     ath11k_mac_vif_txmgmt_idr_remove, vif);
> +	ath11k_mac_vif_txmgmt_cleanup(ar, vif);
>   
>   	for (i = 0; i < ab->hw_params.hal_params->num_tx_rings; i++) {
>   		spin_lock_bh(&ab->dp.tx_ring[i].tx_idr_lock);


-- 
Ramesh