[PATCH] x86-64: Fix 32bit sendfile

If we use 64bit kernel on ia64/x86_64/s390 architecture, and we run
32bit binary on 32bit compatibility mode, sendfile system call seems be
not set offset argument.

This is because sendfile's return value is not zero but the code regards
the result by return value is zero or not.

This problem will be affect to ia64/x86_64/s390 and not affect to other
architecture does not affect other architecture (mips/parisc/ppc64/sparc64).

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index e29a8a55486a..3fa67ecebc83 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -2327,7 +2327,7 @@ sys32_sendfile (int out_fd, int in_fd, int __user *offset, unsigned int count)
         ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *) &of : NULL, count);
         set_fs(old_fs);
 
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
 
         return ret;
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 18610cea03a2..ed877d0f27e6 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -678,7 +678,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, size
         ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
         set_fs(old_fs);
         
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
                 
         return ret;
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 04d80406ce4f..5389df610e78 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -751,7 +751,7 @@ sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
         ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
         set_fs(old_fs);
         
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
                 
         return ret;