lkml.org 
[lkml]   [2023]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 20/27] wifi: mt76: dma: free rx_head in mt76_dma_rx_cleanup
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit 1b88b47e898edef0e56e3a2f4e49f052a136153d ]

    Free rx_head skb in mt76_dma_rx_cleanup routine in order to avoid
    possible memory leak at module unload.

    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/dma.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
    index f01b455783b23..7991705e9d134 100644
    --- a/drivers/net/wireless/mediatek/mt76/dma.c
    +++ b/drivers/net/wireless/mediatek/mt76/dma.c
    @@ -476,6 +476,7 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)
    bool more;

    spin_lock_bh(&q->lock);
    +
    do {
    buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more);
    if (!buf)
    @@ -483,6 +484,12 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)

    skb_free_frag(buf);
    } while (1);
    +
    + if (q->rx_head) {
    + dev_kfree_skb(q->rx_head);
    + q->rx_head = NULL;
    + }
    +
    spin_unlock_bh(&q->lock);

    if (!q->rx_page.va)
    @@ -505,12 +512,6 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid)
    mt76_dma_rx_cleanup(dev, q);
    mt76_dma_sync_idx(dev, q);
    mt76_dma_rx_fill(dev, q);
    -
    - if (!q->rx_head)
    - return;
    -
    - dev_kfree_skb(q->rx_head);
    - q->rx_head = NULL;
    }

    static void
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-27 00:36    [W:4.262 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site