Signed-off-by: Roland Hieber <[email protected]> --- ...e-poll-in-os_unix.c-instead-of-selec.patch | 96 +++++++++++++++++++ patches/fcgi-2.4.0/series | 3 +- 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 patches/fcgi-2.4.0/0004-CVE-2012-6687-use-poll-in-os_unix.c-instead-of-selec.patch
diff --git a/patches/fcgi-2.4.0/0004-CVE-2012-6687-use-poll-in-os_unix.c-instead-of-selec.patch b/patches/fcgi-2.4.0/0004-CVE-2012-6687-use-poll-in-os_unix.c-instead-of-selec.patch new file mode 100644 index 000000000000..2973172ad614 --- /dev/null +++ b/patches/fcgi-2.4.0/0004-CVE-2012-6687-use-poll-in-os_unix.c-instead-of-selec.patch @@ -0,0 +1,96 @@ +From: Anton Kortunov <[email protected]> +Date: Tue, 9 Jul 2019 16:24:02 +0200 +Subject: [PATCH] CVE-2012-6687: use poll in os_unix.c instead of select to + avoid problem with > 1024 connections + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417 +Forwarded: yes, [email protected] +Origin: https://github.com/tehnick/libfcgi-debian/blob/master/debian/patches/use-poll.patch, + https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch, +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591 +Signed-off-by: Roland Hieber <[email protected]> +--- + libfcgi/os_unix.c | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c +index 73e6a7f51522..af35aeed471b 100755 +--- a/libfcgi/os_unix.c ++++ b/libfcgi/os_unix.c +@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp + #include <sys/time.h> + #include <sys/un.h> + #include <signal.h> ++#include <poll.h> + + #ifdef HAVE_NETDB_H + #include <netdb.h> +@@ -103,6 +104,9 @@ static int volatile maxFd = -1; + static int shutdownPending = FALSE; + static int shutdownNow = FALSE; + ++static int libfcgiOsClosePollTimeout = 2000; ++static int libfcgiIsAfUnixKeeperPollTimeout = 2000; ++ + void OS_ShutdownPending() + { + shutdownPending = TRUE; +@@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3]) + if(libInitialized) + return 0; + ++ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" ); ++ if(libfcgiOsClosePollTimeoutStr) { ++ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr); ++ } ++ ++ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" ); ++ if(libfcgiIsAfUnixKeeperPollTimeoutStr) { ++ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr); ++ } ++ + asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo)); + if(asyncIoTable == NULL) { + errno = ENOMEM; +@@ -755,19 +769,16 @@ int OS_Close(int fd) + + if (shutdown(fd, 1) == 0) + { +- struct timeval tv; +- fd_set rfds; ++ struct pollfd pfd; + int rv; + char trash[1024]; + +- FD_ZERO(&rfds); ++ pfd.fd = fd; ++ pfd.events = POLLIN; + + do + { +- FD_SET(fd, &rfds); +- tv.tv_sec = 2; +- tv.tv_usec = 0; +- rv = select(fd + 1, &rfds, NULL, NULL, &tv); ++ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout); + } + while (rv > 0 && read(fd, trash, sizeof(trash)) > 0); + } +@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error) + */ + static int is_af_unix_keeper(const int fd) + { +- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; +- fd_set read_fds; +- +- FD_ZERO(&read_fds); +- FD_SET(fd, &read_fds); ++ struct pollfd pfd; ++ pfd.fd = fd; ++ pfd.events = POLLIN; + +- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); ++ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN); + } + + /* diff --git a/patches/fcgi-2.4.0/series b/patches/fcgi-2.4.0/series index cf1dab231793..0a44f7fd19ca 100644 --- a/patches/fcgi-2.4.0/series +++ b/patches/fcgi-2.4.0/series @@ -3,4 +3,5 @@ 0001-fix-buildsystem.patch 0002-prepare-for-new-autotools.patch 0003-include-stdio.h.patch -# 95fd96128b53d07d1cad2014dcacc9e0 - git-ptx-patches magic +0004-CVE-2012-6687-use-poll-in-os_unix.c-instead-of-selec.patch +# b3af8b9128742fb7ab04b50022c278f5 - git-ptx-patches magic -- 2.20.1 _______________________________________________ ptxdist mailing list [email protected]
