btrfs: rst: minor error handling fixes
cover btrfs: rst: minor error handling fixes
Sashiko found two pre-existing bugs in one small patch unrelated to both bugs.
Both reports are validated by myself manually, and both should be fixed.
Qu Wenruo (2):
btrfs: fix the possible bioc_list memory leak during error
btrfs: return proper negative error code for update_raid_extent_item()
fs/btrfs/inode.c | 3 +++ fs/btrfs/raid-stripe-tree.c | 24 ++++++++++++++++-------- fs/btrfs/raid-stripe-tree.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-)
Signature · 1 line
2.54.0
PATCH 1/2 btrfs: fix the possible bioc_list memory leak during error
There are two possible ways to leak bioc memory on btrfs_ordered_extent::bioc_list:
- An error occurred for btrfs_insert_one_raid_extent() Then the function btrfs_insert_raid_extent() immediately return without freeing any bioc in the bioc_list.
- An ordered extent hit an IO error
In that case the ordered extent will have BTRFS_ORDERED_IOERR set, and skip the call on btrfs_insert_raid_extent() completely.
Fix the problem by:
- Introduce a new helper, btrfs_cleanup_ordered_bioc_list() Which will remove all bioc from the bioc_list, and release the bioc.
- Call the above helper for btrfs_insert_raid_extent() So that the cleanup helper is always called no matter what.
- Call the above helper for btrfs_finish_one_ordered() This is called just before the final release on the ordered extent.
This is reported by Sashiko when reviewing another patch.
--- fs/btrfs/inode.c | 3 +++ fs/btrfs/raid-stripe-tree.c | 18 ++++++++++++------ fs/btrfs/raid-stripe-tree.h | 1 + 3 files changed, 16 insertions(+), 6 deletions(-)
fs/btrfs/inode.c +3 -0
@@ -3436,6 +3436,9 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)*/ btrfs_remove_ordered_extent (ordered_extent); +/* Cleanup any remaining biocs attached to the OE. */ +btrfs_cleanup_ordered_bioc_list (ordered_extent); +/* once for us */ btrfs_put_ordered_extent (ordered_extent);/* once for the tree */
fs/btrfs/raid-stripe-tree.c +12 -6
@@ -373,7 +373,7 @@ int btrfs_insert_raid_extent(struct btrfs_trans_handle *trans, struct btrfs_ordered_extent *ordered_extent) {struct btrfs_io_context *bioc; -int ret; +int ret =0 ;if (!btrfs_fs_incompat (trans->fs_info,RAID_STRIPE_TREE ))return 0 ;
@@ -381,17 +381,23 @@ int btrfs_insert_raid_extent(struct btrfs_trans_handle *trans,list_for_each_entry (bioc, &ordered_extent->bioc_list, rst_ordered_entry) { ret =btrfs_insert_one_raid_extent (trans, bioc);if (ret) -return ret; +break ; } -while (!list_empty (&ordered_extent->bioc_list)) { - bioc =list_first_entry (&ordered_extent->bioc_list, +btrfs_cleanup_ordered_bioc_list (ordered_extent); +return ret; +} + +void btrfs_cleanup_ordered_bioc_list (struct btrfs_ordered_extent *ordered) +{ +while (!list_empty (&ordered->bioc_list)) { +struct btrfs_io_context *bioc; + + bioc =list_first_entry (&ordered->bioc_list,typeof (*bioc), rst_ordered_entry);list_del (&bioc->rst_ordered_entry);btrfs_put_bioc (bioc); } - -return 0 ; } int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,
fs/btrfs/raid-stripe-tree.h +1 -0
@@ -28,6 +28,7 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info, u32 stripe_index, struct btrfs_io_stripe *stripe);int btrfs_insert_raid_extent (struct btrfs_trans_handle *trans,struct btrfs_ordered_extent *ordered_extent); +void btrfs_cleanup_ordered_bioc_list (struct btrfs_ordered_extent *ordered);#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,
Signature · 1 line
2.54.0
PATCH 2/2 btrfs: return proper negative error code for update_raid_extent_item()
In reply to Qu WenruoThe function btrfs_abort_transaction() only accepts negative error code, and have the macro VERIFY_NEGATIVE_ERROR() to verify that error code.
But inside update_raid_extent_item(), if there is such key found, we return 1, breaking the negative error code scheme.
Furthermore if we hit some real error during the tree search, e.g. -EIO, then the error code is always over-written to -EINVAL.
Fix both problems by following other call sites by overwriting @ret to -ENOENT if the btrfs_search_slot() failed to locate the key.
This is very unlikely to hit, as we only enter update_raid_extent_item() if there is a conflicting key already in the raid stripe tree.
This is again reported by Sashiko when reviewing another patch.
--- fs/btrfs/raid-stripe-tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/raid-stripe-tree.c +4 -2
@@ -310,8 +310,10 @@ static int update_raid_extent_item(struct btrfs_trans_handle *trans, ret =btrfs_search_slot (trans, trans->fs_info->stripe_root, key, path,0 ,1 ); -if (ret) -return (ret ==1 ? ret : -EINVAL ); +if (ret >0 ) + ret = -ENOENT ; +if (ret <0 ) +return ret; leaf = path->nodes[0 ]; slot = path->slots[0 ];
Signature · 1 line
2.54.0
Quoted 4 lines · Qu Wenruo
Sashiko found two pre-existing bugs in one small patch unrelated to both bugs.
Both reports are validated by myself manually, and both should be fixed.
Looks good to me,