summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShenghui Wang <shhuiw@foxmail.com>2019-04-25 00:48:43 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-31 06:46:15 -0700
commit8034a6b8999052ae1c99ad098980553f4597a9b7 (patch)
treecbf269cb91f3e2f95024532d11fd26ef7b56aa75
parente82df5f1e54ae1116d473916e7f94ac7143f7b69 (diff)
downloadlinux-stable-8034a6b8999052ae1c99ad098980553f4597a9b7.tar.gz
linux-stable-8034a6b8999052ae1c99ad098980553f4597a9b7.tar.bz2
linux-stable-8034a6b8999052ae1c99ad098980553f4597a9b7.zip
bcache: avoid potential memleak of list of journal_replay(s) in the CACHE_SYNC branch of run_cache_set
[ Upstream commit 95f18c9d1310730d075499a75aaf13bcd60405a7 ] In the CACHE_SYNC branch of run_cache_set(), LIST_HEAD(journal) is used to collect journal_replay(s) and filled by bch_journal_read(). If all goes well, bch_journal_replay() will release the list of jounal_replay(s) at the end of the branch. If something goes wrong, code flow will jump to the label "err:" and leave the list unreleased. This patch will release the list of journal_replay(s) in the case of error detected. v1 -> v2: * Move the release code to the location after label 'err:' to simply the change. Signed-off-by: Shenghui Wang <shhuiw@foxmail.com> Signed-off-by: Coly Li <colyli@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/md/bcache/super.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 2c0d35c882ed..d8190804aee9 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1777,6 +1777,8 @@ static void run_cache_set(struct cache_set *c)
struct cache *ca;
struct closure cl;
unsigned int i;
+ LIST_HEAD(journal);
+ struct journal_replay *l;
closure_init_stack(&cl);
@@ -1934,6 +1936,12 @@ static void run_cache_set(struct cache_set *c)
set_bit(CACHE_SET_RUNNING, &c->flags);
return;
err:
+ while (!list_empty(&journal)) {
+ l = list_first_entry(&journal, struct journal_replay, list);
+ list_del(&l->list);
+ kfree(l);
+ }
+
closure_sync(&cl);
/* XXX: test this, it's broken */
bch_cache_set_error(c, "%s", err);