btrfs: fix ordered extent split error handling in btrfs_dio_submit_io
PATCH 1/1 btrfs: fix ordered extent split error handling in btrfs_dio_submit_io
When the call to btrfs_extract_ordered_extent in btrfs_dio_submit_io fails to allocate memory for a new ordered_extent, it calls into the btrfs_dio_end_io for error handling. btrfs_dio_end_io then assumes that bbio->ordered is set because it is supposed to be at this point, except for this error handling corner case. Try to not overload the btrfs_dio_end_io with error handling of a bio in a non-canonical state, and instead call btrfs_finish_ordered_extent and iomap_dio_bio_end_io directly for this error case.
--- fs/btrfs/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +5 -2
@@ -7849,8 +7849,11 @@ static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio, ret =btrfs_extract_ordered_extent (bbio, dio_data->ordered);if (ret) { - bbio->bio.bi_status =errno_to_blk_status (ret); -btrfs_dio_end_io (bbio); +btrfs_finish_ordered_extent (dio_data->ordered,NULL , + file_offset, dip->bytes, + !ret); + bio->bi_status =errno_to_blk_status (ret); +iomap_dio_bio_end_io (bio);return ; } }
Signature · 1 line
2.39.2
Quoted 9 lines · Christoph Hellwig
When the call to
btrfs_extract_ordered_extentinbtrfs_dio_submit_iofails to allocate memory for a newordered_extent, it calls into thebtrfs_dio_end_iofor error handling.btrfs_dio_end_iothen assumes thatbbio->orderedis set because it is supposed to be at this point, except for this error handling corner case. Try to not overload thebtrfs_dio_end_iowith error handling of a bio in a non-canonical state, and instead callbtrfs_finish_ordered_extentandiomap_dio_bio_end_iodirectly for this error case.
Quoted 4 lines
Fixes b41b6f6937dc ("btrfs: use btrfs_finish_ordered_extent to complete direct writes")Reported-by syzbot <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Tested-by syzbot <[email protected]>
Thanks,
Josef
Quoted 9 lines · Christoph Hellwig
When the call to
btrfs_extract_ordered_extentinbtrfs_dio_submit_iofails to allocate memory for a newordered_extent, it calls into thebtrfs_dio_end_iofor error handling.btrfs_dio_end_iothen assumes thatbbio->orderedis set because it is supposed to be at this point, except for this error handling corner case. Try to not overload thebtrfs_dio_end_iowith error handling of a bio in a non-canonical state, and instead callbtrfs_finish_ordered_extentandiomap_dio_bio_end_iodirectly for this error case.
Quoted 4 lines
Fixes b41b6f6937dc ("btrfs: use btrfs_finish_ordered_extent to complete direct writes")Reported-by syzbot <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Tested-by syzbot <[email protected]>
Added to misc-next, thanks.