btrfs: fix qgroup extent_changeset leak in page_mkwrite
PATCH 1/1 btrfs: fix qgroup extent_changeset leak in page_mkwrite
syzbot reported a memory leak originating from ulist_prealloc() called from qgroup_reserve_data() in the btrfs_page_mkwrite() path. When btrfs_check_data_free_space() succeeds and btrfs_delalloc_reserve_metadata() later fails, we free the data reservation via btrfs_free_reserved_data_space(), but we never free the extent_changeset pointed to by data_reserved.
Add the missing extent_changeset_free(data_reserved) in this error path, matching the other exit paths in btrfs_page_mkwrite() and the failure handling in btrfs_check_data_free_space().
--- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/file.c +2 -0
@@ -1910,6 +1910,8 @@ static vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)if (!only_release_metadata)btrfs_free_reserved_data_space (inode, data_reserved, page_start, reserved_space); +extent_changeset_free (data_reserved); + data_reserved =NULL ; goto out_noreserve; }
Signature · 1 line
2.43.0
Quoted 7 lines · Ahmet Eray Karadag
syzbot reported a memory leak originating from
ulist_prealloc()called fromqgroup_reserve_data()in thebtrfs_page_mkwrite()path. Whenbtrfs_check_data_free_space()succeeds andbtrfs_delalloc_reserve_metadata()later fails, we free the data reservation viabtrfs_free_reserved_data_space(), but we never free theextent_changesetpointed to bydata_reserved.
Quoted 7 lines
Add the missing
extent_changeset_free(data_reserved)in this error path, matching the other exit paths inbtrfs_page_mkwrite()and the failure handling inbtrfs_check_data_free_space().Reported-by [email protected]Signed-off-by Ahmet Eray Karadag <[email protected]>
Already fixed by this patch.
And your fix doesn't even have a proper fixes: tag.
Quoted 17 lines
--- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/file.c +2
-0@@ -1910,6 +1910,8 @@ static vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)if (!only_release_metadata)btrfs_free_reserved_data_space (inode, data_reserved, page_start, reserved_space); +extent_changeset_free (data_reserved); + data_reserved =NULL ; goto out_noreserve; }
Quoted 7 lines · Ahmet Eray Karadag
syzbot reported a memory leak originating from
ulist_prealloc()called fromqgroup_reserve_data()in thebtrfs_page_mkwrite()path. Whenbtrfs_check_data_free_space()succeeds andbtrfs_delalloc_reserve_metadata()later fails, we free the data reservation viabtrfs_free_reserved_data_space(), but we never free theextent_changesetpointed to bydata_reserved.
Quoted 7 lines
Add the missing
extent_changeset_free(data_reserved)in this error path, matching the other exit paths inbtrfs_page_mkwrite()and the failure handling inbtrfs_check_data_free_space().Reported-by [email protected]Signed-off-by Ahmet Eray Karadag <[email protected]>
Thanks a fix is already available and will be in linux-next. Pull request with the fix will be sent after rc1.