Skip to content

Commit 18788e3

Browse files
committed
btrfs: Avoid live-lock in search_ioctl() on hardware with sub-page faults
Commit a48b73e ("btrfs: fix potential deadlock in the search ioctl") addressed a lockdep warning by pre-faulting the user pages and attempting the copy_to_user_nofault() in an infinite loop. On architectures like arm64 with MTE, an access may fault within a page at a location different from what fault_in_writeable() probed. Since the sk_offset is rewound to the previous struct btrfs_ioctl_search_header boundary, there is no guaranteed forward progress and search_ioctl() may live-lock. Use fault_in_subpage_writeable() instead of fault_in_writeable() to ensure the permission is checked at the right granularity (smaller than PAGE_SIZE). Signed-off-by: Catalin Marinas <[email protected]> Fixes: a48b73e ("btrfs: fix potential deadlock in the search ioctl") Reported-by: Al Viro <[email protected]> Acked-by: David Sterba <[email protected]> Cc: Chris Mason <[email protected]> Cc: Josef Bacik <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent f3ba50a commit 18788e3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/btrfs/ioctl.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2565,7 +2565,12 @@ static noinline int search_ioctl(struct inode *inode,
25652565

25662566
while (1) {
25672567
ret = -EFAULT;
2568-
if (fault_in_writeable(ubuf + sk_offset, *buf_size - sk_offset))
2568+
/*
2569+
* Ensure that the whole user buffer is faulted in at sub-page
2570+
* granularity, otherwise the loop may live-lock.
2571+
*/
2572+
if (fault_in_subpage_writeable(ubuf + sk_offset,
2573+
*buf_size - sk_offset))
25692574
break;
25702575

25712576
ret = btrfs_search_forward(root, &key, path, sk->min_transid);

0 commit comments

Comments
 (0)