4 files changed, 10 insertions, 0 deletions

diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 87ab3ff8b758..72c52fee5890 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -349,10 +349,14 @@ main(argc, argv)
     sigaction(SIGUSR1, &sa, NULL);
     sigaction(SIGUSR2, &sa, NULL);
 
+    if (igmp_socket >= FD_SETSIZE)
+	    log(LOG_ERR, 0, "descriptor too big");
     FD_ZERO(&readers);
     FD_SET(igmp_socket, &readers);
     nfds = igmp_socket + 1;
     for (i = 0; i < nhandlers; i++) {
+	if (ihandlers[i].fd >= FD_SETSIZE)
+		log(LOG_ERR, 0, "descriptor too big");
 	FD_SET(ihandlers[i].fd, &readers);
 	if (ihandlers[i].fd >= nfds)
 	    nfds = ihandlers[i].fd + 1;
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 0f09835fa87b..8fdbad0687e0 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -943,6 +943,8 @@ int main(argc, argv)
 	struct timeval 	tv;
 	int 		count, recvlen, dummy = 0;
 
+	if (igmp_socket >= FD_SETSIZE)
+		log(LOG_ERR, 0, "descriptor too big");
 	FD_ZERO(&fds);
 	FD_SET(igmp_socket, &fds);
 
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index a9f9dd9112ea..1df65770eba5 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -434,6 +434,8 @@ main(argc, argv)
 		struct igmp *igmp;
 		int     ipdatalen, iphdrlen, igmpdatalen;
 
+		if (igmp_socket >= FD_SETSIZE)
+			log(LOG_ERR, 0, "descriptor too big");
 		FD_ZERO(&fds);
 		FD_SET(igmp_socket, &fds);
 
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 86655af107e9..c129b464796c 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -1276,6 +1276,8 @@ send_recv(dst, type, code, tries, save, callback)
 	 * Wait for response, discarding false alarms
 	 */
 	while (TRUE) {
+	    if (igmp_socket >= FD_SETSIZE)
+		    log(LOG_ERR, 0, "descriptor too big");
 	    FD_ZERO(&fds);
 	    FD_SET(igmp_socket, &fds);
 	    gettimeofday(&tv, 0);