RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-11 05:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: config: count memory limits on 64 bits, not 32

Browse Source 
It was accidently discovered that limiting haproxy to 5000 MB leads to
an effective limit of 904 MB. This is because the computation for the
size limit is performed by multiplying rlimit_memmax by 1048576, and
doing so causes the operation to be performed on an int instead of a
long or long long. Just switch to 1048576ULL as is done at other places
to fix this.

This bug affects all supported versions, the backport is desired, though
it rarely affects users since few people apply memory limits.
This commit is contained in:
Willy Tarreau 2015-10-29 10:42:55 +01:00
parent 58102cf30b
commit f2dd5e4159
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/haproxy.c
View File

@ -1642,7 +1642,7 @@ int main(int argc, char **argv)
if (global.rlimit_memmax) { if (global.rlimit_memmax) {
limit.rlim_cur = limit.rlim_max = limit.rlim_cur = limit.rlim_max =
global.rlimit_memmax * 1048576 / global.nbproc; global.rlimit_memmax * 1048576ULL / global.nbproc;
#ifdef RLIMIT_AS #ifdef RLIMIT_AS
if (setrlimit(RLIMIT_AS, &limit) == -1) { if (setrlimit(RLIMIT_AS, &limit) == -1) {
Warning("[%s.main()] Cannot fix MEM limit to %d megs.\n", Warning("[%s.main()] Cannot fix MEM limit to %d megs.\n",