AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-13 00:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: wait4: Fix incorrect return value comparison

Browse Source 
Patch 600f00b "linux: Use long time_t for wait4/getrusage" introduced
two bugs:
 - The usage32 struct was set if the wait4 syscall had an error.
 - For 32-bit systems the usage struct was set even if it was specified
   as NULL.

This patch fixes the two issues.
This commit is contained in:
Alistair Francis 2020-04-06 10:56:26 -07:00
parent 2102bec982
commit 00515ea3a1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysdeps/unix/sysv/linux/wait4.c
View File

@ -29,13 +29,13 @@ __wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage)
# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage);
# else
pid_t ret;
struct __rusage32 usage32;
pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
if (ret != 0)
return ret;
ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options,
usage != NULL ? &usage32 : NULL);
if (usage != NULL)
if (ret > 0 && usage != NULL)
rusage32_to_rusage64 (&usage32, usage);
return ret;
@ -114,15 +114,14 @@ libc_hidden_def (__wait4_time64)
pid_t
__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
{
pid_t ret ;
pid_t ret;
struct __rusage64 usage64;
ret = __wait4_time64 (pid, stat_loc, options, &usage64);
ret = __wait4_time64 (pid, stat_loc, options,
usage != NULL ? &usage64 : NULL);
if (ret != 0)
return ret;
rusage64_to_rusage (&usage64, usage);
if (ret > 0 && usage != 0)
rusage64_to_rusage (&usage64, usage);
return ret;
}