wifi: ath9k: fix stale list pointers on A-MPDU subframe retry
PATCH v3 1/1 wifi: ath9k: fix stale list pointers on A-MPDU subframe retry
In ath_tx_complete_aggr(), subframes that need retransmission are moved to the local bf_head list via list_move_tail() For retry frames (txpending), the skb is requeued to bf_pending, but bf_head goes out of scope at the end of the loop iteration, leaving bf->list pointing to freed stack memory. On retry, the buffer is recovered via fi->bf in ath_tx_get_tid_subframe(), and list_add_tail() in ath_tx_form_aggr() overwrites the stale pointers harmlessly, so there is no leak, but the stale pointer is technically a use-after-scope bug.
Fix by calling list_del_init() to cleanly remove the buffer from the dead bf_head and reinitialize its list pointers before the iteration ends. Do not unmap DMA, do not clear fi->bf, and do not return the buffer to the pool - the buffer is needed on retry with the original sequence number to keep the Block Ack window consistent.
---
v3: simplify to just delete. No need for handling others.
v2: set fi-bf to NULL.
drivers/net/wireless/ath/ath9k/xmit.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath9k/xmit.c +3 -0
@@ -667,6 +667,9 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,* queue to retain ordering */ __skb_queue_tail (&bf_pending, skb); + +if (!list_empty (&bf_head)) +list_del_init (&bf->list); } bf = bf_next;
Signature · 1 line
2.54.0