lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 063/180] bcache: fix a leak in bch_cached_dev_run()
    Date
    3.16.7-ckt24 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Al Viro <viro@ZenIV.linux.org.uk>

    commit 4d4d8573a8451acc9f01cbea24b7e55f04a252fe upstream.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Tested-by: Joshua Schmid <jschmid@suse.com>
    Tested-by: Eric Wheeler <bcache@linux.ewheeler.net>
    Cc: Kent Overstreet <kmo@daterainc.com>
    Signed-off-by: Jens Axboe <axboe@fb.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/md/bcache/super.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
    index c2293ae5108f..4a5356879914 100644
    --- a/drivers/md/bcache/super.c
    +++ b/drivers/md/bcache/super.c
    @@ -881,8 +881,11 @@ void bch_cached_dev_run(struct cached_dev *dc)
    buf[SB_LABEL_SIZE] = '\0';
    env[2] = kasprintf(GFP_KERNEL, "CACHED_LABEL=%s", buf);

    - if (atomic_xchg(&dc->running, 1))
    + if (atomic_xchg(&dc->running, 1)) {
    + kfree(env[1]);
    + kfree(env[2]);
    return;
    + }

    if (!d->c &&
    BDEV_STATE(&dc->sb) != BDEV_STATE_NONE) {
    \
     
     \ /
      Last update: 2016-02-04 01:21    [W:2.728 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site