From: Al Viro <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit 4d4d8573a8451acc9f01cbea24b7e55f04a252fe upstream. Signed-off-by: Al Viro <[email protected]> Tested-by: Joshua Schmid <[email protected]> Tested-by: Eric Wheeler <[email protected]> Cc: Kent Overstreet <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- 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 f5004c5c4b96..391e04160c3f 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -841,8 +841,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) { -- 2.7.2
