diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-11-23 16:24:45 -0500 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:35 +0800 |
| commit | 86325076e9777158fa4bd3946c7907b78d69f1eb (patch) | |
| tree | 400d6917c14ce8cef9b3b4f811f85beb236c2c03 | |
| parent | c4b5d77abb7e7c160d5d8c9976e35753caf5fc0b (diff) | |
| download | lwn-86325076e9777158fa4bd3946c7907b78d69f1eb.tar.gz lwn-86325076e9777158fa4bd3946c7907b78d69f1eb.zip | |
dm btree: fix leak of bufio-backed block in btree_split_sibling error path
commit 30ce6e1cc5a0f781d60227e9096c86e188d2c2bd upstream.
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>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -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 be86d59eaa90..77c615eaab44 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -450,8 +450,10 @@ static int btree_split_sibling(struct shadow_spine *s, dm_block_t root, r = insert_at(sizeof(__le64), pn, parent_index + 1, le64_to_cpu(rn->keys[0]), &location); - if (r) + if (r) { + unlock_block(s->info, right); return r; + } if (key < le64_to_cpu(rn->keys[0])) { unlock_block(s->info, right); |