1 files changed, 64 insertions, 46 deletions

diff --git a/fs/compat.c b/fs/compat.c
index 6161255fac45..b7a24d0ca30d 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -870,22 +870,20 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
         struct compat_old_linux_dirent __user *dirent, unsigned int count)
 {
         int error;
-        struct file *file;
-        int fput_needed;
+        struct fd f = fdget(fd);
         struct compat_readdir_callback buf;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        if (!f.file)
                 return -EBADF;
 
         buf.result = 0;
         buf.dirent = dirent;
 
-        error = vfs_readdir(file, compat_fillonedir, &buf);
+        error = vfs_readdir(f.file, compat_fillonedir, &buf);
         if (buf.result)
                 error = buf.result;
 
-        fput_light(file, fput_needed);
+        fdput(f);
         return error;
 }
 
@@ -949,17 +947,16 @@ efault:
 asmlinkage long compat_sys_getdents(unsigned int fd,
                 struct compat_linux_dirent __user *dirent, unsigned int count)
 {
-        struct file * file;
+        struct fd f;
         struct compat_linux_dirent __user * lastdirent;
         struct compat_getdents_callback buf;
-        int fput_needed;
         int error;
 
         if (!access_ok(VERIFY_WRITE, dirent, count))
                 return -EFAULT;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        f = fdget(fd);
+        if (!f.file)
                 return -EBADF;
 
         buf.current_dir = dirent;
@@ -967,17 +964,17 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
         buf.count = count;
         buf.error = 0;
 
-        error = vfs_readdir(file, compat_filldir, &buf);
+        error = vfs_readdir(f.file, compat_filldir, &buf);
         if (error >= 0)
                 error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
-                if (put_user(file->f_pos, &lastdirent->d_off))
+                if (put_user(f.file->f_pos, &lastdirent->d_off))
                         error = -EFAULT;
                 else
                         error = count - buf.count;
         }
-        fput_light(file, fput_needed);
+        fdput(f);
         return error;
 }
 
@@ -1035,17 +1032,16 @@ efault:
 asmlinkage long compat_sys_getdents64(unsigned int fd,
                 struct linux_dirent64 __user * dirent, unsigned int count)
 {
-        struct file * file;
+        struct fd f;
         struct linux_dirent64 __user * lastdirent;
         struct compat_getdents_callback64 buf;
-        int fput_needed;
         int error;
 
         if (!access_ok(VERIFY_WRITE, dirent, count))
                 return -EFAULT;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        f = fdget(fd);
+        if (!f.file)
                 return -EBADF;
 
         buf.current_dir = dirent;
@@ -1053,18 +1049,18 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
         buf.count = count;
         buf.error = 0;
 
-        error = vfs_readdir(file, compat_filldir64, &buf);
+        error = vfs_readdir(f.file, compat_filldir64, &buf);
         if (error >= 0)
                 error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
-                typeof(lastdirent->d_off) d_off = file->f_pos;
+                typeof(lastdirent->d_off) d_off = f.file->f_pos;
                 if (__put_user_unaligned(d_off, &lastdirent->d_off))
                         error = -EFAULT;
                 else
                         error = count - buf.count;
         }
-        fput_light(file, fput_needed);
+        fdput(f);
         return error;
 }
 #endif /* ! __ARCH_OMIT_COMPAT_SYS_GETDENTS64 */
@@ -1152,15 +1148,16 @@ asmlinkage ssize_t
 compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,
                  unsigned long vlen)
 {
-        struct file *file;
-        int fput_needed;
+        struct fd f = fdget(fd);
         ssize_t ret;
+        loff_t pos;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        if (!f.file)
                 return -EBADF;
-        ret = compat_readv(file, vec, vlen, &file->f_pos);
-        fput_light(file, fput_needed);
+        pos = f.file->f_pos;
+        ret = compat_readv(f.file, vec, vlen, &pos);
+        f.file->f_pos = pos;
+        fdput(f);
         return ret;
 }
 
@@ -1168,19 +1165,18 @@ asmlinkage ssize_t
 compat_sys_preadv64(unsigned long fd, const struct compat_iovec __user *vec,
                     unsigned long vlen, loff_t pos)
 {
-        struct file *file;
-        int fput_needed;
+        struct fd f;
         ssize_t ret;
 
         if (pos < 0)
                 return -EINVAL;
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        f = fdget(fd);
+        if (!f.file)
                 return -EBADF;
         ret = -ESPIPE;
-        if (file->f_mode & FMODE_PREAD)
-                ret = compat_readv(file, vec, vlen, &pos);
-        fput_light(file, fput_needed);
+        if (f.file->f_mode & FMODE_PREAD)
+                ret = compat_readv(f.file, vec, vlen, &pos);
+        fdput(f);
         return ret;
 }
 
@@ -1218,15 +1214,16 @@ asmlinkage ssize_t
 compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,
                   unsigned long vlen)
 {
-        struct file *file;
-        int fput_needed;
+        struct fd f = fdget(fd);
         ssize_t ret;
+        loff_t pos;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        if (!f.file)
                 return -EBADF;
-        ret = compat_writev(file, vec, vlen, &file->f_pos);
-        fput_light(file, fput_needed);
+        pos = f.file->f_pos;
+        ret = compat_writev(f.file, vec, vlen, &pos);
+        f.file->f_pos = pos;
+        fdput(f);
         return ret;
 }
 
@@ -1234,19 +1231,18 @@ asmlinkage ssize_t
 compat_sys_pwritev64(unsigned long fd, const struct compat_iovec __user *vec,
                      unsigned long vlen, loff_t pos)
 {
-        struct file *file;
-        int fput_needed;
+        struct fd f;
         ssize_t ret;
 
         if (pos < 0)
                 return -EINVAL;
-        file = fget_light(fd, &fput_needed);
-        if (!file)
+        f = fdget(fd);
+        if (!f.file)
                 return -EBADF;
         ret = -ESPIPE;
-        if (file->f_mode & FMODE_PWRITE)
-                ret = compat_writev(file, vec, vlen, &pos);
-        fput_light(file, fput_needed);
+        if (f.file->f_mode & FMODE_PWRITE)
+                ret = compat_writev(f.file, vec, vlen, &pos);
+        fdput(f);
         return ret;
 }
 
@@ -1796,3 +1792,25 @@ compat_sys_open_by_handle_at(int mountdirfd,
         return do_handle_open(mountdirfd, handle, flags);
 }
 #endif
+
+#ifdef __ARCH_WANT_COMPAT_SYS_SENDFILE
+asmlinkage long compat_sys_sendfile(int out_fd, int in_fd,
+                                    compat_off_t __user *offset, compat_size_t count)
+{
+        loff_t pos;
+        off_t off;
+        ssize_t ret;
+
+        if (offset) {
+                if (unlikely(get_user(off, offset)))
+                        return -EFAULT;
+                pos = off;
+                ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS);
+                if (unlikely(put_user(pos, offset)))
+                        return -EFAULT;
+                return ret;
+        }
+
+        return do_sendfile(out_fd, in_fd, NULL, count, 0);
+}
+#endif /* __ARCH_WANT_COMPAT_SYS_SENDFILE */