btrfs: fix a leaked chunk map issue in read_one_chunk()

Haoxiang Li · kdave · commit 35d99c68af40 · 2025-03-06T14:40:09.000+01:00
Add btrfs_free_chunk_map() to free the memory allocated by btrfs_alloc_chunk_map() if btrfs_add_chunk_map() fails. Fixes: 7dc66ab ("btrfs: use a dedicated data structure for chunk maps") CC: stable@vger.kernel.org Reviewed-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com> Signed-off-by: David Sterba <dsterba@suse.com>
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
@@ -7151,6 +7151,7 @@ static int read_one_chunk(struct btrfs_key *key, struct extent_buffer *leaf,
 		btrfs_err(fs_info,
 			  "failed to add chunk map, start=%llu len=%llu: %d",
 			  map->start, map->chunk_len, ret);
+		btrfs_free_chunk_map(map);
 	}
 
 	return ret;

Original file line number	Diff line number	Diff line change
`@@ -7151,6 +7151,7 @@ static int read_one_chunk(struct btrfs_key key, struct extent_buffer leaf,`
`7151`	`7151`	`btrfs_err(fs_info,`
`7152`	`7152`	`"failed to add chunk map, start=%llu len=%llu: %d",`
`7153`	`7153`	`map->start, map->chunk_len, ret);`
	`7154`	`+ btrfs_free_chunk_map(map);`
`7154`	`7155`	`}`
`7155`	`7156`
`7156`	`7157`	`return ret;`