mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MAJOR: config: properly initialize cpu_map.thread[] up to MAX_THREADS

Browse Source 
A mistake was introduced in 2.4-dev17 by commit 982fb5339 ("MEDIUM:
config: use platform independent type hap_cpuset for cpu-map"), it
initializes cpu_map.thread[] from 0 to MAX_PROCS-1 instead of
MAX_THREADS-1 resulting in crashes when the two differ, e.g. when
building with USE_THREAD= but still with USE_CPU_AFFINITY=1.

No backport is needed.
This commit is contained in:
Willy Tarreau 2021-05-14 08:26:38 +02:00
parent cc9d9b0906
commit 26f42a0779
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/haproxy.c
View File

@ -1778,6 +1778,8 @@ static void init(int argc, char **argv)
for (i = 0; i < MAX_PROCS; ++i) { for (i = 0; i < MAX_PROCS; ++i) {
ha_cpuset_zero(&cpu_map.proc[i]); ha_cpuset_zero(&cpu_map.proc[i]);
ha_cpuset_zero(&cpu_map.proc_t1[i]); ha_cpuset_zero(&cpu_map.proc_t1[i]);
}
for (i = 0; i < MAX_THREADS; ++i) {
ha_cpuset_zero(&cpu_map.thread[i]); ha_cpuset_zero(&cpu_map.thread[i]);
} }
} }