Hurd: compliance fixes for getgroups

Fail with EINVAL when the requested number of groups is negative,
or when it is positive but less than the actual number of groups.

diff --git a/ChangeLog b/ChangeLog
index a804f2cf03ed3bf36ab3b948b803bcc22e35a657..560bb95533fc792f819e8605c2c923bed92101d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
        * sysdeps/mach/hurd/lremovexattr.c: New file, copied from removexattr.c
        with O_NOLINK passed to __file_name_lookup.
 
+       * sysdeps/mach/hurd/getgroups.c: Return -1 and set EINVAL for
+       negative N or less than NGIDS.
+
 2012-07-20  Joseph Myers  <joseph@codesourcery.com>
 
        * elf/Makefile (check-data): Remove.

diff --git a/sysdeps/mach/hurd/getgroups.c b/sysdeps/mach/hurd/getgroups.c
index 157a981740f2952f58c891f30f2f413a22598b58..35b219ef66c366065ed53cc7f593964a6651071a 100644 (file)
--- a/sysdeps/mach/hurd/getgroups.c
+++ b/sysdeps/mach/hurd/getgroups.c
@@ -30,6 +30,9 @@ __getgroups (n, gidset)
   int ngids;
   void *crit;
 
+  if (n < 0)
+    return __hurd_fail (EINVAL);
+
   crit = _hurd_critical_section_lock ();
   __mutex_lock (&_hurd_id.lock);
 
@@ -53,7 +56,7 @@ __getgroups (n, gidset)
       /* Now that the lock is released, we can safely copy the
         group set into the user's array, which might fault.  */
       if (ngids > n)
-       ngids = n;
+       return __hurd_fail (EINVAL);
       memcpy (gidset, gids, ngids * sizeof (gid_t));
     }
   else