diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-24 05:14:49 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-26 07:15:03 +0100 |
| commit | a566c288826ad4502e43b59570214f18173d7744 (patch) | |
| tree | f95245e6aa2d4ba9edf7d065645254e19eefd693 | |
| parent | switch compat_sys_wait4() and compat_sys_waitid() to COMPAT_SYSCALL_DEFINE (diff) | |
| download | linux-a566c288826ad4502e43b59570214f18173d7744.tar.xz linux-a566c288826ad4502e43b59570214f18173d7744.zip | |
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, return ret; if (uru) { - ret = put_compat_rusage(&ru, uru); + /* sys_waitid() overwrites everything in ru */ + if (COMPAT_USE_64BIT_TIME) + ret = copy_to_user(uru, &ru, sizeof(ru)); + else + ret = put_compat_rusage(&ru, uru); if (ret) return ret; } |