Skip to content

Commit d856f75

Browse files
pchelkin91gregkh
authored andcommitted
wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs()
[ Upstream commit c2a94de ] Syzkaller reports a long-known leak of urbs in ath9k_hif_usb_dealloc_tx_urbs(). The cause of the leak is that usb_get_urb() is called but usb_free_urb() (or usb_put_urb()) is not called inside usb_kill_urb() as urb->dev or urb->ep fields have not been initialized and usb_kill_urb() returns immediately. The patch removes trying to kill urbs located in hif_dev->tx.tx_buf because hif_dev->tx.tx_buf is not supposed to contain urbs which are in pending state (the pending urbs are stored in hif_dev->tx.tx_pending). The tx.tx_lock is acquired so there should not be any changes in the list. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: 03fb92a ("ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs()") Signed-off-by: Fedor Pchelkin <[email protected]> Signed-off-by: Alexey Khoroshilov <[email protected]> Acked-by: Toke Høiland-Jørgensen <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sasha Levin <[email protected]>
1 parent 12229a2 commit d856f75

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/net/wireless/ath/ath9k/hif_usb.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,14 +781,10 @@ static void ath9k_hif_usb_dealloc_tx_urbs(struct hif_device_usb *hif_dev)
781781
spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
782782
list_for_each_entry_safe(tx_buf, tx_buf_tmp,
783783
&hif_dev->tx.tx_buf, list) {
784-
usb_get_urb(tx_buf->urb);
785-
spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
786-
usb_kill_urb(tx_buf->urb);
787784
list_del(&tx_buf->list);
788785
usb_free_urb(tx_buf->urb);
789786
kfree(tx_buf->buf);
790787
kfree(tx_buf);
791-
spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
792788
}
793789
spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
794790

0 commit comments

Comments
 (0)