diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-15 00:41:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-15 00:41:58 +0200 |
| commit | fc4f28bb3daf3265d6bc5f73b497306985bb23ab (patch) | |
| tree | 4eb11b6c73209ae321554aa85fbbc01d32466af4 /fs/btrfs | |
| parent | vgacon: remove software scrollback support (diff) | |
| parent | btrfs: fix wrong address when faulting in pages in the search ioctl (diff) | |
| download | linux-fc4f28bb3daf3265d6bc5f73b497306985bb23ab.tar.xz linux-fc4f28bb3daf3265d6bc5f73b497306985bb23ab.zip | |
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/btrfs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
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; |