]> git.hungrycats.org Git - btrfs-progs/commitdiff
btrfs-progs: image: fix the error handling of build_chunk_tree()
authorQu Wenruo <wqu@suse.com>
Sun, 25 Oct 2026 08:41:41 +0000 (19:11 +1030)
committerQu Wenruo <wqu@suse.com>
Mon, 26 Oct 2026 21:38:10 +0000 (08:08 +1030)
When btrfs_check_super() or add_sys_array() failed, the buffer is not
released and the pthread mutex is still locked.

Fix it by adding a new out label, to release the buffer, unlock the
mutex and return the error code.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
image/image-restore.c

index 89ce2f3e79ede6a8925d20275d21d260f129a639..2e4c19746cfbf5a40c144f635cf4ee13208db045 100644 (file)
@@ -1182,14 +1182,12 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,
        ret = btrfs_check_super(super, 0);
        if (ret < 0) {
                error("invalid superblock");
-               return ret;
+               goto out;
        }
        ret = add_sys_array(mdres, super);
        if (ret < 0) {
                error("failed to read system chunk array");
-               free(buffer);
-               pthread_mutex_unlock(&mdres->mutex);
-               return ret;
+               goto out;
        }
        mdres->nodesize = btrfs_super_nodesize(super);
        if (btrfs_super_incompat_flags(super) &
@@ -1200,9 +1198,12 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,
 
        memcpy(mdres->uuid, super->dev_item.uuid, BTRFS_UUID_SIZE);
        mdres->devid = get_unaligned_le64(&super->dev_item.devid);
+out:
        free(buffer);
        pthread_mutex_unlock(&mdres->mutex);
 
+       if (ret < 0)
+               return ret;
        return search_for_chunk_blocks(mdres);
 }