diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-11-23 16:24:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-17 12:34:34 -0800 |
| commit | dd1abb32981ac8848decc40700a63b153f6c1db1 (patch) | |
| tree | c395755ec53a474ea0d47fb3005558c9fc37191b /drivers | |
| parent | d5cdc58aa3dca63c94e70c19199b795a362b0583 (diff) | |
| download | lwn-dd1abb32981ac8848decc40700a63b153f6c1db1.tar.gz lwn-dd1abb32981ac8848decc40700a63b153f6c1db1.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -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 d6e47033b5e0..7ba85e2b146b 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -471,8 +471,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); |