Update.

2003-04-23  Ulrich Drepper  <drepper@redhat.com>

	* grp/initgroups.c (getgrouplist): Don't copy too much into the
	user buffer if more groups are found than fit into it.

	* nis/nss_nis/nis-initgroups.c (_nss_nis_initgroups_dyn): Use
	extend_alloca.

diff --git a/ChangeLog b/ChangeLog
index d64c21bebecd0ef1341a04995497e4ee1c3c1eee..6643aa3ff1ce575936f7848eb9b3e8a8773cd2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * grp/initgroups.c (getgrouplist): Don't copy too much into the
+       user buffer if more groups are found than fit into it.
+
+       * nis/nss_nis/nis-initgroups.c (_nss_nis_initgroups_dyn): Use
+       extend_alloca.
+
 2003-04-23  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/posix/getaddrinfo.c (gaih_inet): Check for rc == ERANGE,

diff --git a/grp/initgroups.c b/grp/initgroups.c
index dd7a8fde1c30b87529309212b9e9f40fd6b1a1ff..1e4c2b5c2b9800b6e3970109d51b71b7e57536e8 100644 (file)
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989,91,93,1996-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1989,91,93,1996-2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <nsswitch.h>
 
@@ -207,6 +208,9 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
     return -1;
 
   result = internal_getgrouplist (user, group, &size, &newgroups, -1);
+
+  memcpy (groups, newgroups, MIN (*ngroups, result) * sizeof (gid_t));
+
   if (result > *ngroups)
     {
       *ngroups = result;
@@ -215,8 +219,6 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
   else
     *ngroups = result;
 
-  memcpy (groups, newgroups, *ngroups * sizeof (gid_t));
-
   free (newgroups);
   return result;
 }

diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c
index de7444e870adf89e95258f0a0957caac6111cc70..e3a8f57fcc728762e91b5e83da3041e4df422027 100644 (file)
--- a/nis/nss_nis/nis-initgroups.c
+++ b/nis/nss_nis/nis-initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -17,10 +17,11 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <nss.h>
-#include <grp.h>
+#include <alloca.h>
 #include <ctype.h>
 #include <errno.h>
+#include <grp.h>
+#include <nss.h>
 #include <string.h>
 #include <unistd.h>
 #include <rpcsvc/yp.h>
@@ -159,10 +160,7 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
              internal_getgrent_r (&grpbuf, tmpbuf, buflen, errnop,
                                   &intern)) == NSS_STATUS_TRYAGAIN
              && *errnop == ERANGE)
-        {
-          buflen *= 2;
-          tmpbuf = __alloca (buflen);
-        }
+       tmpbuf = extend_alloca (tmpbuf, buflen, 2 * buflen);
 
       if (status != NSS_STATUS_SUCCESS)
        goto done;