Date: Thu, 5 Mar 2015 22:44:26 +0000 (UTC) From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380562 - in branches/2015Q1/www/fcgi: . files Message-ID: <201503052244.t25MiQUR025378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigo Date: Thu Mar 5 22:44:25 2015 New Revision: 380562 URL: https://svnweb.freebsd.org/changeset/ports/380562 QAT: https://qat.redports.org/buildarchive/r380562/ Log: MFH: r380457 Patch fcgi to address CVE-2012-6687 vulnerabilities. PR: 197844 Submitted by: rodrigo Obtained from: ubuntu Security: CVE-2012-6687 Approved by: ports-secteam Added: branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool - copied unchanged from r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool Modified: branches/2015Q1/www/fcgi/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/fcgi/Makefile ============================================================================== --- branches/2015Q1/www/fcgi/Makefile Thu Mar 5 22:34:46 2015 (r380561) +++ branches/2015Q1/www/fcgi/Makefile Thu Mar 5 22:44:25 2015 (r380562) @@ -3,7 +3,7 @@ PORTNAME= fcgi PORTVERSION= 2.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://www.fastcgi.com/dist/ \ http://www.skysmurf.nl/comp/FreeBSD/distfiles/ @@ -17,10 +17,11 @@ LICENSE_NAME= Open Market FastCGI licens LICENSE_FILE= ${WRKSRC}/LICENSE.TERMS LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= libtool +USES= cpe libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes +CPE_VENDOR= fastcgi OPTIONS_DEFINE= DOCS Copied: branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool (from r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool Thu Mar 5 22:44:25 2015 (r380562, copy of r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool) @@ -0,0 +1,81 @@ +diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c +index 73e6a7f..af35aee 100755 +--- libfcgi/os_unix.c ++++ 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); + } + + /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503052244.t25MiQUR025378>