btrfs: fix potential segfault in balance_remap_chunks()
PATCH v2 1/1 btrfs: fix potential segfault in balance_remap_chunks()
Fix a potential segfault in balance_remap_chunks(): if we quit early because btrfs_inc_block_group_ro() fails, all the remaining items in the chunks list will still have their bg value set to NULL. It's thus not safe to dereference this pointer without checking first.
Reported-by Chris Mason <[email protected]>
Fixes 81e5a4551c32 ("btrfs: allow balancing remap tree")
Signed-off-by Mark Harmstone <[email protected]>
--- fs/btrfs/volumes.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
fs/btrfs/volumes.c +12 -8
@@ -4285,20 +4285,24 @@ static int balance_remap_chunks(struct btrfs_fs_info *fs_info, struct btrfs_path end:while (!list_empty (chunks)) {bool is_unused; +struct btrfs_block_group *bg; rci = list_first_entry(chunks, struct remap_chunk_info, list); -spin_lock (&rci->bg->lock); - is_unused = !btrfs_is_block_group_used (rci->bg); -spin_unlock (&rci->bg->lock); + bg = rci->bg; +if (bg) { +spin_lock (&bg->lock); + is_unused = !btrfs_is_block_group_used (bg); +spin_unlock (&bg->lock); -if (is_unused) -btrfs_mark_bg_unused (rci->bg); +if (is_unused) +btrfs_mark_bg_unused (bg); -if (rci->made_ro) -btrfs_dec_block_group_ro (rci->bg); +if (rci->made_ro) +btrfs_dec_block_group_ro (bg); -btrfs_put_block_group (rci->bg); +btrfs_put_block_group (bg); + }list_del (&rci->list);kfree (rci);
Signature · 1 line
2.52.0
Looks good,
Reviewed-by Johannes Thumshirn <[email protected]>
Subject changed to "btrfs: check block group before marking it unused in balance_remap_chunks()"
Quoted 53 lines · Mark Harmstone
Fix a potential segfault in
balance_remap_chunks(): if we quit early becausebtrfs_inc_block_group_ro()fails, all the remaining items in the chunks list will still have their bg value set to NULL. It's thus not safe to dereference this pointer without checking first.Reported-by Chris Mason <[email protected]>Fixes 81e5a4551c32 ("btrfs: allow balancing remap tree")Signed-off-by Mark Harmstone <[email protected]>--- fs/btrfs/volumes.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)fs/btrfs/volumes.c +12
-8@@ -4285,20 +4285,24 @@ static int balance_remap_chunks(struct btrfs_fs_info *fs_info, struct btrfs_path end:while (!list_empty (chunks)) {bool is_unused; +struct btrfs_block_group *bg; rci = list_first_entry(chunks, struct remap_chunk_info, list); -spin_lock (&rci->bg->lock); - is_unused = !btrfs_is_block_group_used (rci->bg); -spin_unlock (&rci->bg->lock); + bg = rci->bg; +if (bg) { +spin_lock (&bg->lock); + is_unused = !btrfs_is_block_group_used (bg); +spin_unlock (&bg->lock); -if (is_unused) -btrfs_mark_bg_unused (rci->bg); +if (is_unused) +btrfs_mark_bg_unused (bg); -if (rci->made_ro) -btrfs_dec_block_group_ro (rci->bg); +if (rci->made_ro) +btrfs_dec_block_group_ro (bg); -btrfs_put_block_group (rci->bg); +btrfs_put_block_group (bg); + }list_del (&rci->list);kfree (rci);Signature · 1 line
2.52.0