From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 29 Aug 2003 07:46:40 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~319
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0994e2b880ea1b598c01a0c14b83f7ae0fe33580;p=thirdparty%2Fglibc.git

Update.

2003-08-27  Phil Knirsch <pknirsch@redhat.com>
	    Jakub Jelinek  <jakub@redhat.com>

	* sunrpc/svc.c (svc_getreqset): Fix fds_bits reading on 64-bit
	big endian arches.  Don't read beyond end of fds_bits array.
---

diff --git a/ChangeLog b/ChangeLog
index 8eda2c2f5cf..ede07c1af8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-27  Phil Knirsch <pknirsch@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* sunrpc/svc.c (svc_getreqset): Fix fds_bits reading on 64-bit
+	big endian arches.  Don't read beyond end of fds_bits array.
+
 2003-04-27  Bruno Haible  <bruno@clisp.org>
 
 	* manual/message.texi (Advanced gettext functions): Add information
diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index b7c4f096dd6..fe27c3c8613 100644
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -361,15 +361,17 @@ INTDEF (svc_getreq)
 void
 svc_getreqset (fd_set *readfds)
 {
-  register u_int32_t mask;
-  register u_int32_t *maskp;
+  register fd_mask mask;
+  register fd_mask *maskp;
   register int setsize;
   register int sock;
   register int bit;
 
   setsize = _rpc_dtablesize ();
-  maskp = (u_int32_t *) readfds->fds_bits;
-  for (sock = 0; sock < setsize; sock += 32)
+  if (setsize > FD_SETSIZE)
+    setsize = FD_SETSIZE;
+  maskp = readfds->fds_bits;
+  for (sock = 0; sock < setsize; sock += NFDBITS)
     for (mask = *maskp++; (bit = ffs (mask)); mask ^= (1 << (bit - 1)))
       INTUSE(svc_getreq_common) (sock + bit - 1);
 }