Commit 3865efcb14f46a5e01852d30a34b2c0dce076b3e
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro: "Fix for a really embarrassing braino in iov_iter. Kudos to paulus..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: Fix thinko in iov_iter_single_seg_count
Showing 1 changed file Side-by-side Diff
mm/iov_iter.c
| ... | ... | @@ -911,9 +911,9 @@ |
| 911 | 911 | if (i->nr_segs == 1) |
| 912 | 912 | return i->count; |
| 913 | 913 | else if (i->type & ITER_BVEC) |
| 914 | - return min(i->count, i->iov->iov_len - i->iov_offset); | |
| 915 | - else | |
| 916 | 914 | return min(i->count, i->bvec->bv_len - i->iov_offset); |
| 915 | + else | |
| 916 | + return min(i->count, i->iov->iov_len - i->iov_offset); | |
| 917 | 917 | } |
| 918 | 918 | EXPORT_SYMBOL(iov_iter_single_seg_count); |
| 919 | 919 |