From: Willy Tarreau <w@1wt.eu>
Date: Thu, 29 Oct 2015 09:42:55 +0000 (+0100)
Subject: BUG/MEDIUM: config: count memory limits on 64 bits, not 32
X-Git-Tag: v1.7-dev1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2dd5e4159bd055030cce6c6f4fe7f8988a74e2c;p=thirdparty%2Fhaproxy.git

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

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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 3b0d14df61..93423a9b09 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1642,7 +1642,7 @@ int main(int argc, char **argv)
 
 	if (global.rlimit_memmax) {
 		limit.rlim_cur = limit.rlim_max =
-			global.rlimit_memmax * 1048576 / global.nbproc;
+			global.rlimit_memmax * 1048576ULL / global.nbproc;
 #ifdef RLIMIT_AS
 		if (setrlimit(RLIMIT_AS, &limit) == -1) {
 			Warning("[%s.main()] Cannot fix MEM limit to %d megs.\n",