upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

BUG/MEDIUM: namespace: fix fd leak in master-worker mode

Browse source 
When namespaces are used in the configuration, the respective namespace handles
are opened during config parsing and stored in an ebtree for lookup later.

Unfortunately, when the master process re-execs itself these file descriptors
were not closed, effectively leaking the fds and preventing destruction of
namespaces no longer present in the configuration.

This change fixes this issue by opening the namespace file handles as
close-on-exec, making sure that they will be closed during re-exec.
This commit is contained in:
Krisztin Kovcs (kkovacs) 2019-09-20 14:48:19 +00:00 committed by Willy Tarreau
parent 7ceb96be72
commit 538aa7168f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/namespace.c
View file

@ -24,7 +24,7 @@ static int open_named_namespace(const char *ns_name)
{
if (chunk_printf(&trash, "/var/run/netns/%s", ns_name) < 0)
return -1;
return open(trash.area, O_RDONLY);
return open(trash.area, O_RDONLY | O_CLOEXEC);
}
static int default_namespace = -1;
@ -33,7 +33,7 @@ static int init_default_namespace()
{
if (chunk_printf(&trash, "/proc/%d/ns/net", getpid()) < 0)
return -1;
default_namespace = open(trash.area, O_RDONLY);
default_namespace = open(trash.area, O_RDONLY | O_CLOEXEC);
return default_namespace;
}