RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-21 14:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: listeners: set O_CLOEXEC on the accepted FDs

Browse Source 
Set the O_CLOEXEC flag on the accept, useful to avoid an FD leak in the
master process, since it reexecutes itself during a reload
This commit is contained in:
William Lallemand 2018-10-26 14:47:44 +02:00 committed by Willy Tarreau
parent 4e8450b7d6
commit 0b3e849a48
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/listener.c
View File

@ -545,7 +545,7 @@ void listener_accept(int fd)
/* with sockpair@ we don't want to do an accept */ /* with sockpair@ we don't want to do an accept */
if (unlikely(l->addr.ss_family == AF_CUST_SOCKPAIR)) { if (unlikely(l->addr.ss_family == AF_CUST_SOCKPAIR)) {
if ((cfd = recv_fd_uxst(fd)) != -1) if ((cfd = recv_fd_uxst(fd)) != -1)
fcntl(cfd, F_SETFL, O_NONBLOCK); fcntl(cfd, F_SETFL, O_NONBLOCK|O_CLOEXEC);
} else } else
#ifdef USE_ACCEPT4 #ifdef USE_ACCEPT4
@ -553,12 +553,12 @@ void listener_accept(int fd)
* fallback to the legacy accept() + fcntl(). * fallback to the legacy accept() + fcntl().
*/ */
if (unlikely(accept4_broken || if (unlikely(accept4_broken ||
((cfd = accept4(fd, (struct sockaddr *)&addr, &laddr, SOCK_NONBLOCK)) == -1 && ((cfd = accept4(fd, (struct sockaddr *)&addr, &laddr, SOCK_NONBLOCK|SOCK_CLOEXEC)) == -1 &&
(errno == ENOSYS || errno == EINVAL || errno == EBADF) && (errno == ENOSYS || errno == EINVAL || errno == EBADF) &&
(accept4_broken = 1)))) (accept4_broken = 1))))
#endif #endif
if ((cfd = accept(fd, (struct sockaddr *)&addr, &laddr)) != -1) if ((cfd = accept(fd, (struct sockaddr *)&addr, &laddr)) != -1)
fcntl(cfd, F_SETFL, O_NONBLOCK); fcntl(cfd, F_SETFL, O_NONBLOCK|O_CLOEXEC);
if (unlikely(cfd == -1)) { if (unlikely(cfd == -1)) {
switch (errno) { switch (errno) {