UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fix from Al Viro:
 "Braino fix for iov_iter_revert() misuse"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix braino in generic_file_read_iter()
This commit is contained in:
Linus Torvalds 2017-05-09 09:01:21 -07:00
parent 8ee74a91ac 5b47d59af6
commit 339fbf6796
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

@ -2050,7 +2050,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