diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 23:14:49 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-26 01:15:03 -0500 |
commit | a566c288826ad4502e43b59570214f18173d7744 (patch) | |
tree | f95245e6aa2d4ba9edf7d065645254e19eefd693 | |
parent | 8d9807b109497ca41d363dc7b6ff2bb6c0d52524 (diff) |
x32: fix waitid()
It needs 64bit rusage and 32bit siginfo. glibc never calls it with
non-NULL rusage pointer, or we would've seen breakage already...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | kernel/compat.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 0770ac57c62b..e5cc33c7122c 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
@@ -587,7 +587,11 @@ COMPAT_SYSCALL_DEFINE5(waitid, | |||
587 | return ret; | 587 | return ret; |
588 | 588 | ||
589 | if (uru) { | 589 | if (uru) { |
590 | ret = put_compat_rusage(&ru, uru); | 590 | /* sys_waitid() overwrites everything in ru */ |
591 | if (COMPAT_USE_64BIT_TIME) | ||
592 | ret = copy_to_user(uru, &ru, sizeof(ru)); | ||
593 | else | ||
594 | ret = put_compat_rusage(&ru, uru); | ||
591 | if (ret) | 595 | if (ret) |
592 | return ret; | 596 | return ret; |
593 | } | 597 | } |