Commit fc4f28bb authored by Linus Torvalds's avatar Linus Torvalds

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
parents 973c096f 1c78544e
...@@ -2193,7 +2193,8 @@ static noinline int search_ioctl(struct inode *inode, ...@@ -2193,7 +2193,8 @@ static noinline int search_ioctl(struct inode *inode,
key.offset = sk->min_offset; key.offset = sk->min_offset;
while (1) { 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) if (ret)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment