diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-08-30 16:01:56 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-08-30 16:01:56 +0530 |
| commit | 399c993355bf9f538799f27648b7546aef7c42ee (patch) | |
| tree | 5a835ed35e38a051904067a6d6a642221d22d13c /fs/fuse | |
| parent | cd6f25a4e6e88086f9ad7e2549c3029d354c3832 (diff) | |
| parent | f95b978981a7d154ba40d14c18e8ed5c694e6124 (diff) | |
Merge commit 'v3.4.10' into android-t114-3.4
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 504e61b7fd75..8e6381a14265 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1698,7 +1698,7 @@ static int fuse_verify_ioctl_iov(struct iovec *iov, size_t count) size_t n; u32 max = FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT; - for (n = 0; n < count; n++) { + for (n = 0; n < count; n++, iov++) { if (iov->iov_len > (size_t) max) return -ENOMEM; max -= iov->iov_len; |