hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix braino in generic_file_read_iter() 

Wrong sign of iov_iter_revert() argument.  Unfortunately, slipped through
the testing, since most of the time we don't do anything to the iterator
afterwards and potential oops on walking the iter->iov too far backwards
is too infrequent to be easily triggered.

Add a sanity check in iov_iter_revert() to catch bugs like this one;
fortunately, the same braino hadn't happened in other callers, but we'd
better have a warning if such thing crops up.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-08 13:54:47 -04:00
parent a6a5993243
commit 5b47d59af6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/iov_iter.c
View File

@ -790,6 +790,8 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll)
{ {
if (!unroll) if (!unroll)
return; return;
if (WARN_ON(unroll > MAX_RW_COUNT))
return;
i->count += unroll; i->count += unroll;
if (unlikely(i->type & ITER_PIPE)) { if (unlikely(i->type & ITER_PIPE)) {
struct pipe_inode_info *pipe = i->pipe; struct pipe_inode_info *pipe = i->pipe;

2
mm/filemap.c
View File

@ -2048,7 +2048,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
iocb->ki_pos += retval; iocb->ki_pos += retval;
count -= retval; count -= retval;
} }
iov_iter_revert(iter, iov_iter_count(iter) - count); iov_iter_revert(iter, count - iov_iter_count(iter));
/* /*
* Btrfs can have a short DIO read if we encounter * Btrfs can have a short DIO read if we encounter