diff options
-rw-r--r-- | lib/iov_iter.c | 2 | ||||
-rw-r--r-- | mm/filemap.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index ae82d9cea553..f835964c9485 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c | |||
@@ -790,6 +790,8 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) | |||
790 | { | 790 | { |
791 | if (!unroll) | 791 | if (!unroll) |
792 | return; | 792 | return; |
793 | if (WARN_ON(unroll > MAX_RW_COUNT)) | ||
794 | return; | ||
793 | i->count += unroll; | 795 | i->count += unroll; |
794 | if (unlikely(i->type & ITER_PIPE)) { | 796 | if (unlikely(i->type & ITER_PIPE)) { |
795 | struct pipe_inode_info *pipe = i->pipe; | 797 | struct pipe_inode_info *pipe = i->pipe; |
diff --git a/mm/filemap.c b/mm/filemap.c index b7b973b47d8d..6f1be573a5e6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2050,7 +2050,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) | |||
2050 | iocb->ki_pos += retval; | 2050 | iocb->ki_pos += retval; |
2051 | count -= retval; | 2051 | count -= retval; |
2052 | } | 2052 | } |
2053 | iov_iter_revert(iter, iov_iter_count(iter) - count); | 2053 | iov_iter_revert(iter, count - iov_iter_count(iter)); |
2054 | 2054 | ||
2055 | /* | 2055 | /* |
2056 | * Btrfs can have a short DIO read if we encounter | 2056 | * Btrfs can have a short DIO read if we encounter |