2 files changed, 38 insertions, 18 deletions

diff --git a/sysdeps/unix/sysv/linux/i386/getgroups.c b/sysdeps/unix/sysv/linux/i386/getgroups.c
index c306dd1268..5484f72f1c 100644
--- a/sysdeps/unix/sysv/linux/i386/getgroups.c
+++ b/sysdeps/unix/sysv/linux/i386/getgroups.c
@@ -17,10 +17,13 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
-#include <sys/types.h>
 #include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
 
 #include <sysdep.h>
+#include <sys/syscall.h>
+
 #include <linux/posix_types.h>
 
 extern int __syscall_getgroups __P ((int, __kernel_gid_t *));
@@ -32,14 +35,23 @@ __getgroups (n, groups)
      int n;
      gid_t *groups;
 {
-  int i, ngids;
-  __kernel_gid_t kernel_groups[n];
+  if (n < 0)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+  else
+    {
+      int i, ngids;
+      __kernel_gid_t kernel_groups[n = MIN (n, __sysconf (_SC_NGROUPS_MAX))];
+
+      ngids = INLINE_SYSCALL (getgroups, 2, n, kernel_groups);
+      if (n != 0 && ngids > 0)
+	for (i = 0; i < ngids; i++)
+	  groups[i] = kernel_groups[i];
 
-  ngids = INLINE_SYSCALL (getgroups, 2, n, kernel_groups);
-  if (n != 0 && ngids > 0)
-    for (i = 0; i < ngids; i++)
-      groups[i] = kernel_groups[i];
-  return ngids;
+      return ngids;
+    }
 }
 
 weak_alias (__getgroups, getgroups)
diff --git a/sysdeps/unix/sysv/linux/i386/setgroups.c b/sysdeps/unix/sysv/linux/i386/setgroups.c
index ad2a6b5493..67197e6f06 100644
--- a/sysdeps/unix/sysv/linux/i386/setgroups.c
+++ b/sysdeps/unix/sysv/linux/i386/setgroups.c
@@ -36,18 +36,26 @@ setgroups (n, groups)
      size_t n;
      const gid_t *groups;
 {
-  size_t i;
-  __kernel_gid_t kernel_groups[n];
-
-  for (i = 0; i < n; i++)
+  if (n < 0 || n > __sysconf (_SC_NGROUPS_MAX))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+  else if
     {
-      kernel_groups[i] = groups[i];
-      if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i]))
+      size_t i;
+      __kernel_gid_t kernel_groups[n];
+
+      for (i = 0; i < n; i++)
 	{
-	  __set_errno (EINVAL);
-	  return -1;
+	  kernel_groups[i] = groups[i];
+	  if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i]))
+	    {
+	      __set_errno (EINVAL);
+	      return -1;
+	    }
 	}
-    }
 
-  return INLINE_SYSCALL (setgroups, 2, n, kernel_groups);
+      return INLINE_SYSCALL (setgroups, 2, n, kernel_groups);
+    }
 }