RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: thread: fix extraneous shift in the thread_set parser

Browse Source 
Aurlien reported a bug making a statement such as "thread 2-2" fail for
a config made of exactly 2 threads. What happens is that the parser for
the "thread" keyword scans a range of thread numbers from either 1..64
or 0,-1,-2 for special values, and presets the bit masks accordingly in
the thread set, except that due to the 1..64 range, the shift length must
be reduced by one. Not doing this causes empty masks for single-bit values
that are exactly equal to the number of threads in the group and fails to
properly parse.

No backport is needed as this was introduced in 2.8-dev3 by commit
bef43dfa6 ("MINOR: thread: add a simple thread_set API").
This commit is contained in:
Willy Tarreau 2023-02-06 18:01:50 +01:00
parent d97d1d7c7c
commit f91ab7a08c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/thread.c
View File

@ -1522,7 +1522,7 @@ int parse_thread_set(const char *arg, struct thread_set *ts, char **err)
if (max >= min) {
for (v = min; v <= max; v++)
ts->rel[tg - 1] |= 1UL << v;
ts->rel[tg - 1] |= 1UL << (v - 1);
} else {
memset(&ts->rel[tg - 1],
(max == 0) ? 0xff /* all */ : (max == -1) ? 0x55 /* odd */: 0xaa /* even */,
@ -1532,7 +1532,7 @@ int parse_thread_set(const char *arg, struct thread_set *ts, char **err)
/* absolute thread numbers */
if (max >= min) {
for (v = min; v <= max; v++)
ts->abs[v / LONGBITS] |= 1UL << (v % LONGBITS);
ts->abs[(v - 1) / LONGBITS] |= 1UL << ((v - 1) % LONGBITS);
} else {
memset(&ts->abs,
(max == 0) ? 0xff /* all */ : (max == -1) ? 0x55 /* odd */: 0xaa /* even */,