From: Shenghui Wang shhuiw@foxmail.com
mainline inclusion from mainline-5.2-rc1 commit f16277ca20acf2c213fcd4b645f4c1cffcadf533 category: backport
Elements of keylist should be accessed before the list is freed. Move bch_keylist_free() calling after the while loop to avoid wrong content accessed.
Signed-off-by: Shenghui Wang shhuiw@foxmail.com Signed-off-by: Coly Li colyli@suse.de Signed-off-by: Jens Axboe axboe@kernel.dk --- drivers/md/bcache/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 6e04f4333495..572dcc7651b1 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -1512,11 +1512,11 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op,
out_nocoalesce: closure_sync(&cl); - bch_keylist_free(&keylist);
while ((k = bch_keylist_pop(&keylist))) if (!bkey_cmp(k, &ZERO_KEY)) atomic_dec(&b->c->prio_blocked); + bch_keylist_free(&keylist);
for (i = 0; i < nodes; i++) if (!IS_ERR_OR_NULL(new_nodes[i])) {