]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread
authorColy Li <colyli@suse.de>
Fri, 28 Jun 2019 11:59:44 +0000 (19:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:12:55 +0000 (09:12 +0200)
commit f54d801dda14942dbefa00541d10603015b7859c upstream.

Commit 9baf30972b55 ("bcache: fix for gc and write-back race") added a
new work queue dc->writeback_write_wq, but forgot to destroy it in the
error condition when creating dc->writeback_thread failed.

This patch destroys dc->writeback_write_wq if kthread_create() returns
error pointer to dc->writeback_thread, then a memory leak is avoided.

Fixes: 9baf30972b55 ("bcache: fix for gc and write-back race")
Signed-off-by: Coly Li <colyli@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/bcache/writeback.c

index df0f4e5a051a0dfd0ba55b89bbbf828951e388c4..e9ffcea1ca50478edc94ae55afb0ca3866d6650d 100644 (file)
@@ -834,6 +834,7 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)
                                              "bcache_writeback");
        if (IS_ERR(dc->writeback_thread)) {
                cached_dev_put(dc);
+               destroy_workqueue(dc->writeback_write_wq);
                return PTR_ERR(dc->writeback_thread);
        }
        dc->writeback_running = true;