diff options
author | Mike Snitzer <snitzer@redhat.com> | 2015-11-23 16:24:45 -0500 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-12-02 13:20:34 -0500 |
commit | 30ce6e1cc5a0f781d60227e9096c86e188d2c2bd (patch) | |
tree | 4d1217d25ff2d2e6db70e11a04ce52f82a781cb8 /drivers/md/persistent-data | |
parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) |
dm btree: fix leak of bufio-backed block in btree_split_sibling error path
The block allocated at the start of btree_split_sibling() is never
released if later insert_at() fails.
Fix this by releasing the previously allocated bufio block using
unlock_block().
Reported-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/md/persistent-data')
-rw-r--r-- | drivers/md/persistent-data/dm-btree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c index c573402033b2..0918a7c5f809 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c | |||
@@ -473,8 +473,10 @@ static int btree_split_sibling(struct shadow_spine *s, unsigned parent_index, | |||
473 | 473 | ||
474 | r = insert_at(sizeof(__le64), pn, parent_index + 1, | 474 | r = insert_at(sizeof(__le64), pn, parent_index + 1, |
475 | le64_to_cpu(rn->keys[0]), &location); | 475 | le64_to_cpu(rn->keys[0]), &location); |
476 | if (r) | 476 | if (r) { |
477 | unlock_block(s->info, right); | ||
477 | return r; | 478 | return r; |
479 | } | ||
478 | 480 | ||
479 | if (key < le64_to_cpu(rn->keys[0])) { | 481 | if (key < le64_to_cpu(rn->keys[0])) { |
480 | unlock_block(s->info, right); | 482 | unlock_block(s->info, right); |