mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: http_ext: unhandled ERR_ABORT in proxy_http_parse_7239()

Browse Source 
_proxy_http_parse_7239_expr() helper used in proxy_http_parse_7239()
function may return ERR_ABORT in case of memory error. But the error check
used below is insufficient to catch ERR_ABORT so the function could keep
executing prior to returning ERR_ABORT, which may cause undefined
behavior. Hopefully no sensitive handling is performed in this case so
this bug has very limited impact, but let's fix it anyway.

We now use ERR_CODE mask instead of ERR_FATAL to check if err_code is set
to any kind of error combination that should prevent the function from
further executing.

This may be backported in 2.8 with b2bb9257d2 ("MINOR: proxy/http_ext:
introduce proxy forwarded option")
This commit is contained in:
Aurelien DARRAGON 2023-07-04 10:33:33 +02:00 committed by Christopher Faulet
parent 999699a277
commit 5028a6e50b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http_ext.c
View File

@ -997,7 +997,7 @@ int proxy_http_parse_7239(char **args, int cur_arg,
fwd->p_host.mode = HTTP_7239_HOST_SMP;
err_code |= _proxy_http_parse_7239_expr(args, &cur_arg, file, linenum,
&fwd->p_host.expr_s);
if (err_code & ERR_FATAL)
if (err_code & ERR_CODE)
goto out;
} else if (strcmp(args[cur_arg], "by") == 0) {
fwd->p_by.nn_mode = HTTP_7239_FORBY_ORIG;
@ -1006,7 +1006,7 @@ int proxy_http_parse_7239(char **args, int cur_arg,
fwd->p_by.nn_mode = HTTP_7239_FORBY_SMP;
err_code |= _proxy_http_parse_7239_expr(args, &cur_arg, file, linenum,
&fwd->p_by.nn_expr_s);
if (err_code & ERR_FATAL)
if (err_code & ERR_CODE)
goto out;
} else if (strcmp(args[cur_arg], "for") == 0) {
fwd->p_for.nn_mode = HTTP_7239_FORBY_ORIG;
@ -1015,7 +1015,7 @@ int proxy_http_parse_7239(char **args, int cur_arg,
fwd->p_for.nn_mode = HTTP_7239_FORBY_SMP;
err_code |= _proxy_http_parse_7239_expr(args, &cur_arg, file, linenum,
&fwd->p_for.nn_expr_s);
if (err_code & ERR_FATAL)
if (err_code & ERR_CODE)
goto out;
} else if (strcmp(args[cur_arg], "by_port") == 0) {
fwd->p_by.np_mode = HTTP_7239_FORBY_ORIG;
@ -1024,7 +1024,7 @@ int proxy_http_parse_7239(char **args, int cur_arg,
fwd->p_by.np_mode = HTTP_7239_FORBY_SMP;
err_code |= _proxy_http_parse_7239_expr(args, &cur_arg, file, linenum,
&fwd->p_by.np_expr_s);
if (err_code & ERR_FATAL)
if (err_code & ERR_CODE)
goto out;
} else if (strcmp(args[cur_arg], "for_port") == 0) {
fwd->p_for.np_mode = HTTP_7239_FORBY_ORIG;
@ -1033,7 +1033,7 @@ int proxy_http_parse_7239(char **args, int cur_arg,
fwd->p_for.np_mode = HTTP_7239_FORBY_SMP;
err_code |= _proxy_http_parse_7239_expr(args, &cur_arg, file, linenum,
&fwd->p_for.np_expr_s);
if (err_code & ERR_FATAL)
if (err_code & ERR_CODE)
goto out;
} else {
/* unknown suboption - catchall */