Skip to content

Commit

Permalink
mt76: mt7663u: fix memory leaks in mt7663u_probe
Browse files Browse the repository at this point in the history
Fix the two following memory leaks in mt7663u_probe:
1- if device power-own times out, remove ieee80211 hw device.
2- if mt76u queues allocation fails, remove pending urbs.

Fixes: eb99cc95c3b65 ("mt76: mt7615: introduce mt7663u support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/e4098f0c8a9ac51997de07f38c2bcdf7042d6db1.1592755166.git.lorenzo@kernel.org
  • Loading branch information
LorenzoBianconi authored and nbd168 committed Aug 23, 2020
1 parent 8c7c1a2 commit f0beb7c
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 10 deletions.
11 changes: 6 additions & 5 deletions mt7615/usb.c
Expand Up @@ -119,25 +119,26 @@ static int mt7663u_probe(struct usb_interface *usb_intf,
if (!mt76_poll_msec(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_PWR_ON,
FW_STATE_PWR_ON << 1, 500)) {
dev_err(dev->mt76.dev, "Timeout for power on\n");
return -EIO;
ret = -EIO;
goto error;
}

alloc_queues:
ret = mt76u_alloc_mcu_queue(&dev->mt76);
if (ret)
goto error;
goto error_free_q;

ret = mt76u_alloc_queues(&dev->mt76);
if (ret)
goto error;
goto error_free_q;

ret = mt7663_usb_sdio_register_device(dev);
if (ret)
goto error_freeq;
goto error_free_q;

return 0;

error_freeq:
error_free_q:
mt76u_queues_deinit(&dev->mt76);
error:
usb_set_intfdata(usb_intf, NULL);
Expand Down
22 changes: 17 additions & 5 deletions usb.c
Expand Up @@ -1021,31 +1021,41 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)

static void mt76u_free_tx(struct mt76_dev *dev)
{
struct mt76_queue *q;
int i, j;
int i;

for (i = 0; i < IEEE80211_NUM_ACS; i++) {
struct mt76_queue *q;
int j;

q = dev->q_tx[i].q;
if (!q)
continue;

for (j = 0; j < q->ndesc; j++)
usb_free_urb(q->entry[j].urb);
}
}

void mt76u_stop_tx(struct mt76_dev *dev)
{
struct mt76_queue_entry entry;
struct mt76_queue *q;
int i, j, ret;
int ret;

mt76_worker_disable(&dev->tx_worker);

ret = wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(&dev->phy),
HZ / 5);
if (!ret) {
struct mt76_queue_entry entry;
struct mt76_queue *q;
int i, j;

dev_err(dev->dev, "timed out waiting for pending tx\n");

for (i = 0; i < IEEE80211_NUM_ACS; i++) {
q = dev->q_tx[i].q;
if (!q)
continue;

for (j = 0; j < q->ndesc; j++)
usb_kill_urb(q->entry[j].urb);
}
Expand All @@ -1055,6 +1065,8 @@ void mt76u_stop_tx(struct mt76_dev *dev)
*/
for (i = 0; i < IEEE80211_NUM_ACS; i++) {
q = dev->q_tx[i].q;
if (!q)
continue;

/* Assure we are in sync with killed tasklet. */
spin_lock_bh(&q->lock);
Expand Down

0 comments on commit f0beb7c

Please sign in to comment.