]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: fix a leak in bch_cached_dev_run()
authorAl Viro <viro@ZenIV.linux.org.uk>
Mon, 30 Nov 2015 01:20:59 +0000 (17:20 -0800)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 2 Feb 2016 19:09:09 +0000 (19:09 +0000)
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

index c2293ae5108f7b6cbffb6ee928b8e47055d6df65..4a535687991471146a1da764bfc144a406accf7e 100644 (file)
@@ -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) {