summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-15 01:41:58 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-15 01:41:58 +0300
commitfc4f28bb3daf3265d6bc5f73b497306985bb23ab (patch)
tree4eb11b6c73209ae321554aa85fbbc01d32466af4 /fs
parent973c096f6a85e5b5f2a295126ba6928d9a6afd45 (diff)
parent1c78544eaa4660096aeb6a57ec82b42cdb3bfe5a (diff)
downloadlinux-fc4f28bb3daf3265d6bc5f73b497306985bb23ab.tar.xz
Merge tag 'for-5.9-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba: "One of the recent lockdep fixes introduced a bug that breaks the search ioctl, which is used by some applications (bees, compsize). The patch made it to stable trees so we need this fixup to make it work again" * tag 'for-5.9-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: fix wrong address when faulting in pages in the search ioctl
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index ac45f022b495..2d9109d9e98f 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2193,7 +2193,8 @@ static noinline int search_ioctl(struct inode *inode,
key.offset = sk->min_offset;
while (1) {
- ret = fault_in_pages_writeable(ubuf, *buf_size - sk_offset);
+ ret = fault_in_pages_writeable(ubuf + sk_offset,
+ *buf_size - sk_offset);
if (ret)
break;