lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 094/222] ath5k: fix tx path skb leaks
    Date
    3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit 596ab5ec3bf10a22be30d7cb1d903a4b83fd607c upstream.

    ieee80211_free_txskb() needs to be used instead of dev_kfree_skb_any for
    tx packets passed to the driver from mac80211

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/net/wireless/ath/ath5k/base.c | 4 ++--
    drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
    index 44ad6fe..10a9985 100644
    --- a/drivers/net/wireless/ath/ath5k/base.c
    +++ b/drivers/net/wireless/ath/ath5k/base.c
    @@ -845,7 +845,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf)
    return;
    dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
    DMA_TO_DEVICE);
    - dev_kfree_skb_any(bf->skb);
    + ieee80211_free_txskb(ah->hw, bf->skb);
    bf->skb = NULL;
    bf->skbaddr = 0;
    bf->desc->ds_data = 0;
    @@ -1572,7 +1572,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
    return;

    drop_packet:
    - dev_kfree_skb_any(skb);
    + ieee80211_free_txskb(hw, skb);
    }

    static void
    diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
    index 22b80af..4c8ba4d 100644
    --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
    +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
    @@ -61,7 +61,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
    u16 qnum = skb_get_queue_mapping(skb);

    if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
    - dev_kfree_skb_any(skb);
    + ieee80211_free_txskb(hw, skb);
    return;
    }

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-16 18:01    [W:4.151 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site