ath9k: fix yet another buffer leak in the tx aggregation code
PATCH 1/1 ath9k: fix yet another buffer leak in the tx aggregation code
When an aggregation session is being cleaned up, while the tx status for some frames is being processed, the TID is flushed and its buffers are sent out.
Unfortunately that left the pending un-acked frames unprocessed, thus leaking buffers. Fix this by reordering the code so that those frames are processed first, before the TID is flushed.
Signed-off-by Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath9k/xmit.c +8 -8
@@ -518,6 +518,14 @@ static void ath_tx_complete_aggr(struct bf = bf_next; } +/* prepend un-acked frames to the beginning of the pending frame queue */ +if (!list_empty (&bf_pending)) { +spin_lock_bh (&txq->axq_lock); +list_splice (&bf_pending, &tid->buf_q); +ath_tx_queue_tid (txq, tid); +spin_unlock_bh (&txq->axq_lock); + } +if (tid->state &AGGR_CLEANUP ) {if (tid->baw_head == tid->baw_tail) { tid->state &= ~AGGR_ADDBA_COMPLETE ;
@@ -530,14 +538,6 @@ static void ath_tx_complete_aggr(structreturn ; } -/* prepend un-acked frames to the beginning of the pending frame queue */ -if (!list_empty (&bf_pending)) { -spin_lock_bh (&txq->axq_lock); -list_splice (&bf_pending, &tid->buf_q); -ath_tx_queue_tid (txq, tid); -spin_unlock_bh (&txq->axq_lock); - } -rcu_read_unlock ();if (needreset)