lkml.org 
[lkml]   [2010]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[16/36] ath9k: fix a potential buffer leak in the STA teardown path
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

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

    From: Felix Fietkau <nbd@openwrt.org>

    commit 2b40994cabd2f545d5c11d3a65dcee6f6f9155f8 upstream.

    It looks like it might be possible for a TID to be paused, while still
    holding some queued buffers, however ath_tx_node_cleanup currently only
    iterates over active TIDs.
    Fix this by always checking every allocated TID for the STA that is being
    cleaned up.

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath9k/xmit.c | 56 +++++++++++++++++-----------------
    1 file changed, 28 insertions(+), 28 deletions(-)

    --- a/drivers/net/wireless/ath/ath9k/xmit.c
    +++ b/drivers/net/wireless/ath/ath9k/xmit.c
    @@ -2230,37 +2230,37 @@ void ath_tx_node_init(struct ath_softc *

    void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
    {
    - int i;
    - struct ath_atx_ac *ac, *ac_tmp;
    - struct ath_atx_tid *tid, *tid_tmp;
    + struct ath_atx_ac *ac;
    + struct ath_atx_tid *tid;
    struct ath_txq *txq;
    + int i, tidno;

    - for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
    - if (ATH_TXQ_SETUP(sc, i)) {
    - txq = &sc->tx.txq[i];
    -
    - spin_lock_bh(&txq->axq_lock);
    -
    - list_for_each_entry_safe(ac,
    - ac_tmp, &txq->axq_acq, list) {
    - tid = list_first_entry(&ac->tid_q,
    - struct ath_atx_tid, list);
    - if (tid && tid->an != an)
    - continue;
    - list_del(&ac->list);
    - ac->sched = false;
    -
    - list_for_each_entry_safe(tid,
    - tid_tmp, &ac->tid_q, list) {
    - list_del(&tid->list);
    - tid->sched = false;
    - ath_tid_drain(sc, txq, tid);
    - tid->state &= ~AGGR_ADDBA_COMPLETE;
    - tid->state &= ~AGGR_CLEANUP;
    - }
    - }
    + for (tidno = 0, tid = &an->tid[tidno];
    + tidno < WME_NUM_TID; tidno++, tid++) {
    + i = tid->ac->qnum;

    - spin_unlock_bh(&txq->axq_lock);
    + if (!ATH_TXQ_SETUP(sc, i))
    + continue;
    +
    + txq = &sc->tx.txq[i];
    + ac = tid->ac;
    +
    + spin_lock_bh(&txq->axq_lock);
    +
    + if (tid->sched) {
    + list_del(&tid->list);
    + tid->sched = false;
    }
    +
    + if (ac->sched) {
    + list_del(&ac->list);
    + tid->ac->sched = false;
    + }
    +
    + ath_tid_drain(sc, txq, tid);
    + tid->state &= ~AGGR_ADDBA_COMPLETE;
    + tid->state &= ~AGGR_CLEANUP;
    +
    + spin_unlock_bh(&txq->axq_lock);
    }
    }



    \
     
     \ /
      Last update: 2010-08-06 21:33    [W:0.024 / U:0.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site