@@ -1,3 +1,7 @@

+Tue Aug 31 15:10:29 EEST 2010 (edwin)

+-------------------------------------

+ * clamd/clamd.c: limit RLIMIT_DATA to 2GB on 32-bit processes (bb #1941).

+

 Tue Aug 31 11:13:44 EEST 2010 (edwin)

 -------------------------------------

  * libclamav/regex/regexec.c: fix regex when sizeof(void*) != sizeof(long) (bb #2232).

@@ -30,6 +30,7 @@

 #endif

 #ifndef _WIN32

 #include <sys/time.h>

+#include <sys/resource.h>

 #endif

 #include <sys/types.h>

 #include <sys/stat.h>

@@ -108,6 +109,7 @@ int main(int argc, char **argv)

 #ifndef	_WIN32

         struct passwd *user = NULL;

 	struct sigaction sa;

+	struct rlimit rlim;

 #endif

 	time_t currtime;

 	const char *dbdir, *cfgfile;

@@ -295,6 +297,26 @@ int main(int argc, char **argv)

 	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

 #endif

+#ifdef RLIMIT_DATA

+    if (getrlimit(RLIMIT_DATA, &rlim) == 0) {

+       /* bb #1941.

+        * On 32-bit FreeBSD if you set ulimit -d to >2GB then mmap() will fail

+        * too soon (after ~120 MB).

+        * Set limit lower than 2G if on 32-bit */

+       uint64_t lim = rlim.rlim_cur;

+       lim = (int32_t) lim;

+       if (sizeof(void*) == 4 &&

+           lim != rlim.rlim_cur) {

+           rlim.rlim_cur = 2048*1024-1;

+           if (setrlimit(RLIMIT_DATA, &rlim) < 0)

+               logg("!setrlimit(RLIMIT_DATA) failed: %s\n", strerror(errno));

+           else

+               logg("^Running on 32-bit system, and RLIMIT_DATA > 2GB, lowering to 2GB!\n");

+       }

+    }

+#endif

+

+

     if(logg_size)

 	logg("#Log file size limited to %d bytes.\n", logg_size);

     else