diff options
author | Joe Thornber <ejt@redhat.com> | 2015-12-10 14:37:53 +0000 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2016-01-18 22:27:26 +0000 |
commit | a94064d4ee8ff28a1de3decd6a5b3a329848c5b3 (patch) | |
tree | 1c7babf6d785b3d93835b4d7b67de753613f2b27 /drivers/md | |
parent | 35f6d73878b83e480a5435b71ff6b82e22b5ad77 (diff) | |
download | linux-stable-a94064d4ee8ff28a1de3decd6a5b3a329848c5b3.tar.gz linux-stable-a94064d4ee8ff28a1de3decd6a5b3a329848c5b3.tar.bz2 linux-stable-a94064d4ee8ff28a1de3decd6a5b3a329848c5b3.zip |
dm btree: fix bufio buffer leaks in dm_btree_del() error path
commit ed8b45a3679eb49069b094c0711b30833f27c734 upstream.
If dm_btree_del()'s call to push_frame() fails, e.g. due to
btree_node_validator finding invalid metadata, the dm_btree_del() error
path must unlock all frames (which have active dm-bufio buffers) that
were pushed onto the del_stack.
Otherwise, dm_bufio_client_destroy() will BUG_ON() because dm-bufio
buffers have leaked, e.g.:
device-mapper: bufio: leaked buffer 3, hold count 1, list 0
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/persistent-data/dm-btree.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c index 7ba85e2b146b..7b4bb1f09b01 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -250,6 +250,16 @@ static void pop_frame(struct del_stack *s) dm_tm_unlock(s->tm, f->b); } +static void unlock_all_frames(struct del_stack *s) +{ + struct frame *f; + + while (unprocessed_frames(s)) { + f = s->spine + s->top--; + dm_tm_unlock(s->tm, f->b); + } +} + int dm_btree_del(struct dm_btree_info *info, dm_block_t root) { int r; @@ -306,9 +316,13 @@ int dm_btree_del(struct dm_btree_info *info, dm_block_t root) pop_frame(s); } } - out: + if (r) { + /* cleanup all frames of del_stack */ + unlock_all_frames(s); + } kfree(s); + return r; } EXPORT_SYMBOL_GPL(dm_btree_del); |