1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MEDIUM: server: properly initialize PROXY v2 TLVs

Browse Source 
The PROXY v2 TLVs were not properly initialized when defined with
"set-proxy-v2-tlv-fmt" keyword, which could have caused a crash when
validating the configuration or malfunction (e.g. when used in
combination with "server-template" and/or "default-server").

The issue was introduced with commit 6f4bfed3a ("MINOR: server: Add
parser support for set-proxy-v2-tlv-fmt").

This should be backported up to 2.9.
This commit is contained in:
Dragan Dosen 2025-02-26 19:13:31 +01:00 committed by Willy Tarreau
parent 706b008429
commit 6838fe43a3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.c
View File

@ -1706,6 +1706,7 @@ static int srv_parse_set_proxy_v2_tlv_fmt(char **args, int *cur_arg,
goto fail; goto fail;
} }
srv_tlv->type = tlv_type; srv_tlv->type = tlv_type;
lf_expr_init(&srv_tlv->fmt);
srv_tlv->fmt_string = strdup(args[*cur_arg + 1]); srv_tlv->fmt_string = strdup(args[*cur_arg + 1]);
if (unlikely(!srv_tlv->fmt_string)) { if (unlikely(!srv_tlv->fmt_string)) {
memprintf(err, "'%s' : failed to save format string for parsing", args[*cur_arg]); memprintf(err, "'%s' : failed to save format string for parsing", args[*cur_arg]);
@ -2966,6 +2967,15 @@ void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl
break; break;
} }
new_srv_tlv->type = srv_tlv->type; new_srv_tlv->type = srv_tlv->type;
lf_expr_init(&new_srv_tlv->fmt);
if (srv_tmpl) {
if (new_srv_tlv->fmt_string && unlikely(!parse_logformat_string(new_srv_tlv->fmt_string,
srv->proxy, &new_srv_tlv->fmt, 0, SMP_VAL_BE_SRV_CON, NULL))) {
free(new_srv_tlv->fmt_string);
free(new_srv_tlv);
break;
}
}
LIST_APPEND(&srv->pp_tlvs, &new_srv_tlv->list); LIST_APPEND(&srv->pp_tlvs, &new_srv_tlv->list);
} }
} }
@ -3708,7 +3718,6 @@ static int _srv_parse_finalize(char **args, int cur_arg,
} }
list_for_each_entry(srv_tlv, &srv->pp_tlvs, list) { list_for_each_entry(srv_tlv, &srv->pp_tlvs, list) {
lf_expr_init(&srv_tlv->fmt);
if (srv_tlv->fmt_string && unlikely(!parse_logformat_string(srv_tlv->fmt_string, if (srv_tlv->fmt_string && unlikely(!parse_logformat_string(srv_tlv->fmt_string,
srv->proxy, &srv_tlv->fmt, 0, SMP_VAL_BE_SRV_CON, &errmsg))) { srv->proxy, &srv_tlv->fmt, 0, SMP_VAL_BE_SRV_CON, &errmsg))) {
if (errmsg) { if (errmsg) {