head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.80
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.78
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.76
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.74
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.72
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.70
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.68
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.66
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.64
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.62
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.60
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.58
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.56
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.54
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.52
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.50
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.48
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.46
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.44
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.42
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.40
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.38
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.36
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.32
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.34
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.30
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.28
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.26
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.24
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.22
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.20
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.18
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.16
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.14
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.10
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.8
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.6
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.4
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.2
	pkgsrc-2016Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2016.04.20.13.52.24;	author prlw1;	state Exp;
branches;
next	;
commitid	SSZLXXR1uWlq1n3z;


desc
@@


1.1
log
@Defend against calling select() with nfds >= FD_SETSIZE.
PR pkg/50995
@
text
@$NetBSD$

Defend against calling select() with nfds >= FD_SETSIZE. PR pkg/50995
https://github.com/e2guardian/e2guardian/issues/119

--- src/BaseSocket.cpp.orig	2012-09-29 20:06:45.000000000 +0000
+++ src/BaseSocket.cpp
@@@@ -61,6 +61,12 @@@@ int selectEINTR(int numfds, fd_set * rea
 	timeval exittime;
 	timeval elapsedtime;
 	timeval timeoutcopy;
+
+	if (numfds >= FD_SETSIZE) {
+		syslog(LOG_ERR, "selectEINTR called with numfds (%d) >= FD_SETSIZE (%d)", numfds, FD_SETSIZE);
+		errno = EBADF;
+		return -1;
+	}
 	while (true) {  // using the while as a restart point with continue
 		if (timeout != NULL) {
 			gettimeofday(&entrytime, NULL);
@@@@ -313,6 +319,9 @@@@ int BaseSocket::getLine(char *buff, int 
 #endif
 		//if there was a socket error
 		if (bufflen < 0) {
+#ifdef DGDEBUG
+			syslog(LOG_ERR, "getLine recv returned error = %d (%m)\n", errno);
+#endif
 			if (errno == EINTR && (honour_reloadconfig ? !reloadconfig : true)) {
 				continue;
 			}
@@@@ -423,6 +432,9 @@@@ int BaseSocket::readFromSocketn(char *bu
 		}
 		rc = recv(sck, buff, cnt, flags);
 		if (rc < 0) {
+#ifdef DGDEBUG
+			syslog(LOG_ERR, "readFromSocketn recv returned error = %d (%m)\n", errno);
+#endif
 			if (errno == EINTR) {
 				continue;
 			}
@@@@ -473,9 +485,14 @@@@ int BaseSocket::readFromSocket(char *buf
 	while (true) {
 		rc = recv(sck, buff, cnt, flags);
 		if (rc < 0) {
+#ifdef DGDEBUG
+			syslog(LOG_ERR, "readFromSocket recv returned unhandled? error = %d (%m)\n", errno);
+#endif
 			if (errno == EINTR && (honour_reloadconfig ? !reloadconfig : true)) {
 				continue;
 			}
+			sleep(1);
+			continue;
 		}
 
 		break;
@