Messages in this thread Patch in this message | | | From | Christoph Hellwig <> | Date | Mon, 15 Sep 2014 16:21:51 -0400 | Subject | [PATCH 6/7] move flags enforcement to vfs_preadv/vfs_pwritev |
| |
Acked-by: Milosz Tanski <milosz@adfin.com> --- fs/read_write.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/fs/read_write.c b/fs/read_write.c index 87a6034..233ea98 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -863,6 +863,8 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec, return -EBADF; if (!(file->f_mode & FMODE_CAN_READ)) return -EINVAL; + if (flags & ~O_NONBLOCK) + return -EINVAL; return do_readv_writev(READ, file, vec, vlen, pos, flags); } @@ -876,6 +878,8 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec, return -EBADF; if (!(file->f_mode & FMODE_CAN_WRITE)) return -EINVAL; + if (flags & ~0) + return -EINVAL; return do_readv_writev(WRITE, file, vec, vlen, pos, flags); } @@ -908,9 +912,6 @@ SYSCALL_DEFINE4(readv2, unsigned long, fd, const struct iovec __user *, vec, struct fd f = fdget_pos(fd); ssize_t ret = -EBADF; - if (flags & ~O_NONBLOCK) - return -EINVAL; - if (f.file) { loff_t pos = file_pos_read(f.file); ret = vfs_readv(f.file, vec, vlen, &pos, flags); @@ -951,9 +952,6 @@ SYSCALL_DEFINE4(writev2, unsigned long, fd, const struct iovec __user *, vec, struct fd f = fdget_pos(fd); ssize_t ret = -EBADF; - if (flags & ~0) - return -EINVAL; - if (f.file) { loff_t pos = file_pos_read(f.file); ret = vfs_writev(f.file, vec, vlen, &pos, flags); @@ -1006,8 +1004,6 @@ SYSCALL_DEFINE6(preadv2, unsigned long, fd, const struct iovec __user *, vec, struct fd f; ssize_t ret = -EBADF; - if (flags & ~O_NONBLOCK) - return -EINVAL; if (pos < 0) return -EINVAL; @@ -1057,8 +1053,6 @@ SYSCALL_DEFINE6(pwritev2, unsigned long, fd, const struct iovec __user *, vec, struct fd f; ssize_t ret = -EBADF; - if (flags & ~0) - return -EINVAL; if (pos < 0) return -EINVAL; -- 1.7.9.5
| |