lkml.org 
[lkml]   [2011]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] [staging] iio, adc: Do not leak memory in ad7280_event_handler()
    If ad7280_read_all_channels() returns <0 then we'll leak the memory
    allocated to 'channels' when we return and that variable goes out of
    scope.
    This patch fixes the leak.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    ---
    drivers/staging/iio/adc/ad7280a.c | 4 +++-
    1 files changed, 3 insertions(+), 1 deletions(-)

    note: I don't have the hardware, so patch is compile tested only.

    diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
    index 372d059..dddc03c 100644
    --- a/drivers/staging/iio/adc/ad7280a.c
    +++ b/drivers/staging/iio/adc/ad7280a.c
    @@ -687,8 +687,10 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
    return IRQ_HANDLED;

    ret = ad7280_read_all_channels(st, st->scan_cnt, channels);
    - if (ret < 0)
    + if (ret < 0) {
    + kfree(channels);
    return IRQ_HANDLED;
    + }

    for (i = 0; i < st->scan_cnt; i++) {
    if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) {
    --
    1.7.7.2

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2011-11-06 22:47    [W:0.019 / U:29.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site