Browse Source

Fix #66908: php-fpm reload leaks epoll_create() file descriptor

This patch fixes descriptor leak which could lead to DoS once Max open files is reached
pull/657/head
Julio Pintos 13 years ago
committed by Stanislav Malyshev
parent
commit
49341e992a
  1. 4
      NEWS
  2. 6
      sapi/fpm/fpm/events/epoll.c

4
NEWS

@ -11,6 +11,10 @@ PHP NEWS
. Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag,
not only the subset). (Anatol)
- FPM:
. Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
(Julio Pintos)
?? ??? 2014, PHP 5.4.28
- Core:

6
sapi/fpm/fpm/events/epoll.c

@ -46,7 +46,7 @@ static struct fpm_event_module_s epoll_module = {
static struct epoll_event *epollfds = NULL;
static int nepollfds = 0;
static int epollfd = 0;
static int epollfd = -1;
#endif /* HAVE_EPOLL */
@ -103,6 +103,10 @@ static int fpm_event_epoll_clean() /* {{{ */
free(epollfds);
epollfds = NULL;
}
if (epollfd != -1) {
close(epollfd);
epollfd = -1;
}
nepollfds = 0;

Loading…
Cancel
Save