public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH v4 1/2] linux: wait4: Fix incorrect return value comparison
@ 2020-04-10 18:55 Alistair Francis
  2020-04-10 18:55 ` [PATCH v3 2/2] linux: Add wait4 test case Alistair Francis
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Alistair Francis @ 2020-04-10 18:55 UTC (permalink / raw)
  To: libc-alpha; +Cc: alistair23, Alistair Francis

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.
---
 sysdeps/unix/sysv/linux/wait4.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
index d14bd4da27..44c55f60fe 100644
--- a/sysdeps/unix/sysv/linux/wait4.c
+++ b/sysdeps/unix/sysv/linux/wait4.c
@@ -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;
 }
-- 
2.26.0


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v3 1/2] linux: wait4: Fix incorrect return value comparison
@ 2020-04-09 20:11 Alistair Francis
  2020-04-09 20:11 ` [PATCH v3 2/2] linux: Add wait4 test case Alistair Francis
  0 siblings, 1 reply; 7+ messages in thread
From: Alistair Francis @ 2020-04-09 20:11 UTC (permalink / raw)
  To: libc-alpha; +Cc: alistair23, Alistair Francis

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.
---
 sysdeps/unix/sysv/linux/wait4.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
index d14bd4da27..21eb154b72 100644
--- a/sysdeps/unix/sysv/linux/wait4.c
+++ b/sysdeps/unix/sysv/linux/wait4.c
@@ -29,14 +29,18 @@ __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
-  struct __rusage32 usage32;
-  pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
-
-  if (ret != 0)
-    return ret;
+  pid_t ret;
 
   if (usage != NULL)
-    rusage32_to_rusage64 (&usage32, usage);
+    {
+      struct __rusage32 usage32;
+        ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
+
+      if (ret > 0)
+        rusage32_to_rusage64 (&usage32, usage);
+    }
+  else
+    ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, NULL);
 
   return ret;
 # endif
@@ -114,15 +118,19 @@ libc_hidden_def (__wait4_time64)
 pid_t
 __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
 {
-  pid_t ret ;
-  struct __rusage64 usage64;
+  pid_t ret;
 
-  ret = __wait4_time64 (pid, stat_loc, options, &usage64);
+  if (usage != NULL)
+    {
+      struct __rusage64 usage64;
 
-  if (ret != 0)
-    return ret;
+      ret = __wait4_time64 (pid, stat_loc, options, &usage64);
 
-  rusage64_to_rusage (&usage64, usage);
+      if (ret > 0)
+        rusage64_to_rusage (&usage64, usage);
+    }
+  else
+    ret = __wait4_time64 (pid, stat_loc, options, NULL);
 
   return ret;
 }
-- 
2.26.0


^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-04-14 12:08 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-10 18:55 [PATCH v4 1/2] linux: wait4: Fix incorrect return value comparison Alistair Francis
2020-04-10 18:55 ` [PATCH v3 2/2] linux: Add wait4 test case Alistair Francis
2020-04-10 18:55 ` [PATCH v4 2/2] posix: " Alistair Francis
2020-04-14 12:08   ` Andreas Schwab
2020-04-14 12:07 ` [PATCH v4 1/2] linux: wait4: Fix incorrect return value comparison Andreas Schwab
  -- strict thread matches above, loose matches on Subject: below --
2020-04-09 20:11 [PATCH v3 " Alistair Francis
2020-04-09 20:11 ` [PATCH v3 2/2] linux: Add wait4 test case Alistair Francis
2020-04-09 21:46   ` Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).