RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 23:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MAJOR: listener: Make sure the listener exist before using it.

Browse Source 
In listener_accept(), make sure we have a listener before attempting to
use it.
An another thread may have closed the FD meanwhile, and set fdtab[fd].owner
to NULL.
As the listener is not free'd, it is ok to attempt to accept() a new
connection even if the listener was closed. At worst the fd has been
reassigned to another connection, and accept() will fail anyway.

Many thanks to Richard Russo for reporting the problem, and suggesting the
fix.

This should be backported to 1.9 and 1.8.
This commit is contained in:
Olivier Houchard 2019-02-25 16:18:16 +01:00
parent bc9d9844d5
commit d16a9dfed8
1 changed files with 6 additions and 2 deletions

8
src/listener.c
View File

@ -448,8 +448,8 @@ void delete_listener(struct listener *listener)
void listener_accept(int fd)
{
struct listener *l = fdtab[fd].owner;
struct proxy *p = l->bind_conf->frontend;
int max_accept = l->maxaccept ? l->maxaccept : 1;
struct proxy *p;
int max_accept;
int expire;
int cfd;
int ret;
@ -457,6 +457,10 @@ void listener_accept(int fd)
static int accept4_broken;
#endif
if (!l)
return;
p = l->bind_conf->frontend;
max_accept = l->maxaccept ? l->maxaccept : 1;
if (HA_SPIN_TRYLOCK(LISTENER_LOCK, &l->lock))
return;