lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[045/107] ath5k: fix memory leak when fewer than N_PD_CURVES are in use
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

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

    From: "Eugene A. Shatokhin" <dame_eugene@mail.ru>

    commit a0b8de350be458b33248e48b2174d9af8a4c4798 upstream.

    We would free the proper number of curves, but in the wrong
    slots, due to a missing level of indirection through
    the pdgain_idx table.

    It's simpler just to try to free all four slots, so do that.

    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath5k/eeprom.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    --- a/drivers/net/wireless/ath/ath5k/eeprom.c
    +++ b/drivers/net/wireless/ath/ath5k/eeprom.c
    @@ -1565,14 +1565,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k
    if (!chinfo[pier].pd_curves)
    continue;

    - for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
    + for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
    struct ath5k_pdgain_info *pd =
    &chinfo[pier].pd_curves[pdg];

    - if (pd != NULL) {
    - kfree(pd->pd_step);
    - kfree(pd->pd_pwr);
    - }
    + kfree(pd->pd_step);
    + kfree(pd->pd_pwr);
    }

    kfree(chinfo[pier].pd_curves);



    \
     
     \ /
      Last update: 2011-07-08 07:09    [W:4.181 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site