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

BUG/MINOR: stick-table: Never exceed (MAX_SESS_STKCTR-1) when fetching a stkctr

Browse Source 
When a stick counter is fetched, it is important that the requested counter does
not exceed (MAX_SESS_STKCTR -1). Actually, there is no bug with a default build
because, by construction, MAX_SESS_STKCTR is defined to 3 and we know that we
never exceed the max value. scN_* sample fetches are numbered from 0 to 2. For
other sample fetches, the value is tested.

But there is a bug if MAX_SESS_STKCTR is set to a lower value. For instance
1. In this case the counters sc1_* and sc2_* may be undefined.

This patch fixes the issue #330. It must be backported as far as 1.7.
This commit is contained in:
Christopher Faulet 2019-10-21 10:53:34 +02:00
parent e566f3db11
commit a9fa88a1ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stick_table.c
View File

@ -2148,8 +2148,6 @@ smp_fetch_sc_stkctr(struct session *sess, struct stream *strm, const struct arg
if (num == '_' - '0') { if (num == '_' - '0') {
/* sc_* variant, args[0] = ctr# (mandatory) */ /* sc_* variant, args[0] = ctr# (mandatory) */
num = args[arg++].data.sint; num = args[arg++].data.sint;
if (num >= MAX_SESS_STKCTR)
return NULL;
} }
else if (num > 9) { /* src_* variant, args[0] = table */ else if (num > 9) { /* src_* variant, args[0] = table */
struct stktable_key *key; struct stktable_key *key;
@ -2180,7 +2178,10 @@ smp_fetch_sc_stkctr(struct session *sess, struct stream *strm, const struct arg
* the sc[0-9]_ form, or even higher using sc_(num) if needed. * the sc[0-9]_ form, or even higher using sc_(num) if needed.
* args[arg] is the first optional argument. We first lookup the * args[arg] is the first optional argument. We first lookup the
* ctr form the stream, then from the session if it was not there. * ctr form the stream, then from the session if it was not there.
* But we must be sure the counter does not exceed MAX_SESS_STKCTR.
*/ */
if (num >= MAX_SESS_STKCTR)
return NULL;
if (strm) if (strm)
stkptr = &strm->stkctr[num]; stkptr = &strm->stkctr[num];