RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-28 00:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: filters: Don't try to init filters for disabled proxies

Browse Source 
Configuration is parsed for such proxies but not validated. Concretely, it means
check_config_validity() function does almost nothing for such proxies. Thus, we
must be careful to not initialize filters for disabled proxies because the check
callback function is not called. In fact, to be sure to avoid any trouble,
filters for disabled proxies are released.

This patch fixes a segfault at startup if the SPOE is configured for a disabled
proxy. It must be backported as far as 1.7 (maybe with some adaptations).
This commit is contained in:
Christopher Faulet 2020-11-02 16:08:09 +01:00
parent c9dfee43f3
commit 400829cd2c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/filters.c
View File

@ -291,6 +291,10 @@ flt_init_all()
int err_code = 0;
for (px = proxies_list; px; px = px->next) {
if (px->disabled) {
flt_deinit(px);
continue;
}
err_code |= flt_init(px);
if (err_code & (ERR_ABORT|ERR_FATAL)) {
ha_alert("Failed to initialize filters for proxy '%s'.\n",
@ -310,6 +314,9 @@ flt_init_all_per_thread()
int err_code = 0;
for (px = proxies_list; px; px = px->next) {
if (px->disabled)
continue;
err_code = flt_init_per_thread(px);
if (err_code & (ERR_ABORT|ERR_FATAL)) {
ha_alert("Failed to initialize filters for proxy '%s' for thread %u.\n",
@ -349,7 +356,7 @@ flt_deinit(struct proxy *proxy)
struct flt_conf *fconf, *back;
list_for_each_entry_safe(fconf, back, &proxy->filter_configs, list) {
if (fconf->ops->deinit)
if (!proxy->disabled && fconf->ops->deinit)
fconf->ops->deinit(proxy, fconf);
LIST_DEL(&fconf->list);
free(fconf);
@ -378,8 +385,10 @@ flt_deinit_all_per_thread()
{
struct proxy *px;
for (px = proxies_list; px; px = px->next)
flt_deinit_per_thread(px);
for (px = proxies_list; px; px = px->next) {
if (!px->disabled)
flt_deinit_per_thread(px);
}
}
/* Attaches a filter to a stream. Returns -1 if an error occurs, 0 otherwise. */