3 files changed, 22 insertions, 13 deletions

diff --git a/fs/read_write.c b/fs/read_write.c
index 009d8542a889..f45b2ae5d5f1 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -412,6 +412,23 @@ ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *p
 
 EXPORT_SYMBOL(new_sync_read);
 
+ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,
+                   loff_t *pos)
+{
+        ssize_t ret;
+
+        if (file->f_op->read)
+                ret = file->f_op->read(file, buf, count, pos);
+        else if (file->f_op->aio_read)
+                ret = do_sync_read(file, buf, count, pos);
+        else if (file->f_op->read_iter)
+                ret = new_sync_read(file, buf, count, pos);
+        else
+                ret = -EINVAL;
+
+        return ret;
+}
+
 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
 {
         ssize_t ret;
@@ -426,12 +443,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
         ret = rw_verify_area(READ, file, pos, count);
         if (ret >= 0) {
                 count = ret;
-                if (file->f_op->read)
-                        ret = file->f_op->read(file, buf, count, pos);
-                else if (file->f_op->aio_read)
-                        ret = do_sync_read(file, buf, count, pos);
-                else
-                        ret = new_sync_read(file, buf, count, pos);
+                ret = __vfs_read(file, buf, count, pos);
                 if (ret > 0) {
                         fsnotify_access(file);
                         add_rchar(current, ret);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e11d60cc867b..ac3a36e05da9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1527,6 +1527,7 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
                               struct iovec *fast_pointer,
                               struct iovec **ret_pointer);
 
+extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
 extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
 extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
 extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
diff --git a/security/integrity/iint.c b/security/integrity/iint.c
index df45640fbac6..dbb6d141c3db 100644
--- a/security/integrity/iint.c
+++ b/security/integrity/iint.c
@@ -184,20 +184,16 @@ int integrity_kernel_read(struct file *file, loff_t offset,
 {
         mm_segment_t old_fs;
         char __user *buf = (char __user *)addr;
-        ssize_t ret = -EINVAL;
+        ssize_t ret;
 
         if (!(file->f_mode & FMODE_READ))
                 return -EBADF;
 
         old_fs = get_fs();
         set_fs(get_ds());
-        if (file->f_op->read)
-                ret = file->f_op->read(file, buf, count, &offset);
-        else if (file->f_op->aio_read)
-                ret = do_sync_read(file, buf, count, &offset);
-        else if (file->f_op->read_iter)
-                ret = new_sync_read(file, buf, count, &offset);
+        ret = __vfs_read(file, buf, count, &offset);
         set_fs(old_fs);
+
         return ret;
 }