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

BUG/MINOR: http_ana: clarify connection pointer check on L7 retry

Browse Source 
Coverity reports a possible null deref in issue #703. It seems this
cannot happen as in order to have a CF_READ_ERROR we'd need to have
attempted a recv() which implies a conn_stream, thus conn cannot be
NULL anymore. But at least one line tests for conn and the other one
not, which is confusing. So let's add a check for conn before
dereferencing it.

This needs to be backported to 2.1 and 2.0. Note that in 2.0 it's
in proto_htx.c.
This commit is contained in:
Willy Tarreau 2020-06-23 05:58:20 +02:00
parent 2fd5bdb439
commit ee99aaf1f9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http_ana.c
View File

@ -1532,7 +1532,7 @@ int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
/* Check to see if the server refused the early data. /* Check to see if the server refused the early data.
* If so, just send a 425 * If so, just send a 425
*/ */
if (conn->err_code == CO_ER_SSL_EARLY_FAILED) { if (conn && conn->err_code == CO_ER_SSL_EARLY_FAILED) {
if ((s->be->retry_type & PR_RE_EARLY_ERROR) && if ((s->be->retry_type & PR_RE_EARLY_ERROR) &&
(si_b->flags & SI_FL_L7_RETRY) && (si_b->flags & SI_FL_L7_RETRY) &&
do_l7_retry(s, si_b) == 0) { do_l7_retry(s, si_b) == 0) {