dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Al Viro 2012-12-23 23:14:49 -05:00
parent 8d9807b109
commit a566c28882
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/compat.c
View File

@ -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;
}