From 0994e2b880ea1b598c01a0c14b83f7ae0fe33580 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 29 Aug 2003 07:46:40 +0000
Subject: 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.
---
sunrpc/svc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'sunrpc/svc.c')
diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index b7c4f096dd..fe27c3c861 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);
}
--
cgit v1.2.1