RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MEDIUM] ensure we don't recursively call pool_gc2()

Browse Source 
A race condition exists in the hot reconfiguration code. It is
theorically possible that the second signal is sent during a free()
in the first list, which can cause crashes or freezes (the later
have been observed). Just set up a counter to ensure we do not
recurse.
This commit is contained in:
Willy Tarreau 2009-04-21 02:17:45 +02:00
parent 3b88d441e9
commit b7f9d126e2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/memory.c
View File

@ -122,11 +122,17 @@ void pool_flush2(struct pool_head *pool)
/* /*
* This function frees whatever can be freed in all pools, but respecting * This function frees whatever can be freed in all pools, but respecting
* the minimum thresholds imposed by owners. * the minimum thresholds imposed by owners. It takes care of avoiding
* recursion because it may be called from a signal handler.
*/ */
void pool_gc2() void pool_gc2()
{ {
static int recurse;
struct pool_head *entry; struct pool_head *entry;
if (recurse++)
goto out;
list_for_each_entry(entry, &pools, list) { list_for_each_entry(entry, &pools, list) {
void *temp, *next; void *temp, *next;
//qfprintf(stderr, "Flushing pool %s\n", entry->name); //qfprintf(stderr, "Flushing pool %s\n", entry->name);
@ -141,6 +147,8 @@ void pool_gc2()
} }
entry->free_list = next; entry->free_list = next;
} }
out:
recurse--;
} }
/* /*