summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorTsuneo.Yoshioka@f-secure.com <Tsuneo.Yoshioka@f-secure.com>2005-09-12 16:49:24 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 17:49:57 (GMT)
commit83b942bd3437d84d6ddf582477120b6b86369052 (patch)
tree75fcfc6d7f175cd35911bf93713d45a82c67a3fc /arch/s390
parent9acf23c42b13d682abbd5db1d293c7a77ae54b61 (diff)
downloadlinux-83b942bd3437d84d6ddf582477120b6b86369052.tar.xz
[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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/compat_linux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 18610ce..ed877d0 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;