mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
filemap: Fix bounds checking in filemap_read()
If the caller supplies an iocb->ki_pos value that is close to the
filesystem upper limit, and an iterator with a count that causes us to
overflow that limit, then filemap_read() enters an infinite loop.
This behaviour was discovered when testing xfstests generic/525 with the
"localio" optimisation for loopback NFS mounts.
Reported-by: Mike Snitzer <snitzer@kernel.org>
Fixes: c2a9737f45
("vfs,mm: fix a dead loop in truncate_inode_pages_range()")
Tested-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a9cda7c0ff
commit
ace149e083
@ -2625,7 +2625,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter,
|
|||||||
if (unlikely(!iov_iter_count(iter)))
|
if (unlikely(!iov_iter_count(iter)))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
|
iov_iter_truncate(iter, inode->i_sb->s_maxbytes - iocb->ki_pos);
|
||||||
folio_batch_init(&fbatch);
|
folio_batch_init(&fbatch);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
Loading…
Reference in New Issue
Block a user