Skip to content

Commit 577aa5a

Browse files
fdmananamehmetb0
authored andcommitted
btrfs: fix use-after-free when COWing tree bock and tracing is enabled
BugLink: https://bugs.launchpad.net/bugs/2103869 commit 44f52bbe96dfdbe4aca3818a2534520082a07040 upstream. When a COWing a tree block, at btrfs_cow_block(), and we have the tracepoint trace_btrfs_cow_block() enabled and preemption is also enabled (CONFIG_PREEMPT=y), we can trigger a use-after-free in the COWed extent buffer while inside the tracepoint code. This is because in some paths that call btrfs_cow_block(), such as btrfs_search_slot(), we are holding the last reference on the extent buffer @buf so btrfs_force_cow_block() drops the last reference on the @buf extent buffer when it calls free_extent_buffer_stale(buf), which schedules the release of the extent buffer with RCU. This means that if we are on a kernel with preemption, the current task may be preempted before calling trace_btrfs_cow_block() and the extent buffer already released by the time trace_btrfs_cow_block() is called, resulting in a use-after-free. Fix this by moving the trace_btrfs_cow_block() from btrfs_cow_block() to btrfs_force_cow_block() before the COWed extent buffer is freed. This also has a side effect of invoking the tracepoint in the tree defrag code, at defrag.c:btrfs_realloc_node(), since btrfs_force_cow_block() is called there, but this is fine and it was actually missing there. Reported-by: syzbot+8517da8635307182c8a5@syzkaller.appspotmail.com Link: https://lore.kernel.org/linux-btrfs/6759a9b9.050a0220.1ac542.000d.GAE@google.com/ CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CVE-2024-56759 Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
1 parent cc60a88 commit 577aa5a

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

fs/btrfs/ctree.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,8 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans,
674674
return ret;
675675
}
676676
}
677+
678+
trace_btrfs_cow_block(root, buf, cow);
677679
if (unlock_orig)
678680
btrfs_tree_unlock(buf);
679681
free_extent_buffer_stale(buf);
@@ -725,7 +727,6 @@ int btrfs_cow_block(struct btrfs_trans_handle *trans,
725727
{
726728
struct btrfs_fs_info *fs_info = root->fs_info;
727729
u64 search_start;
728-
int ret;
729730

730731
if (unlikely(test_bit(BTRFS_ROOT_DELETING, &root->state))) {
731732
btrfs_abort_transaction(trans, -EUCLEAN);
@@ -766,12 +767,8 @@ int btrfs_cow_block(struct btrfs_trans_handle *trans,
766767
* Also We don't care about the error, as it's handled internally.
767768
*/
768769
btrfs_qgroup_trace_subtree_after_cow(trans, root, buf);
769-
ret = btrfs_force_cow_block(trans, root, buf, parent, parent_slot,
770-
cow_ret, search_start, 0, nest);
771-
772-
trace_btrfs_cow_block(root, buf, *cow_ret);
773-
774-
return ret;
770+
return btrfs_force_cow_block(trans, root, buf, parent, parent_slot,
771+
cow_ret, search_start, 0, nest);
775772
}
776773
ALLOW_ERROR_INJECTION(btrfs_cow_block, ERRNO);
777774

0 commit comments

Comments
 (0)