From: Florian Weimer Date: Mon, 7 Mar 2016 12:48:47 +0000 (+0100) Subject: test-skeleton.c: Do not set RLIMIT_DATA [BZ #19648] X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6eea05ee7bc49dbe9531620595fd7f6ca587dcd;p=thirdparty%2Fglibc.git test-skeleton.c: Do not set RLIMIT_DATA [BZ #19648] With older kernels, it is mostly ineffective because it causes malloc to switch from sbrk to mmap (potentially invalidating malloc testing compared to what real appliations do). With newer kernels which have switched to enforcing RLIMIT_DATA for mmap as well, some test cases will fail in an unintended fashion because the limit which was set previously does not include room for all mmap mappings. (cherry picked from commit 900056024b75eae8b550d7fee1dec9e71f28344e) --- diff --git a/ChangeLog b/ChangeLog index 88ad53a6a10..2da868aa133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-03-07 Florian Weimer + + [BZ #19648] + * test-skeleton.c (main): Do not set RLIMIT_DATA. + 2016-05-23 Florian Weimer [BZ #20111] diff --git a/test-skeleton.c b/test-skeleton.c index a2edf836b76..7ab3529c68d 100644 --- a/test-skeleton.c +++ b/test-skeleton.c @@ -428,23 +428,6 @@ main (int argc, char *argv[]) setrlimit (RLIMIT_CORE, &core_limit); #endif -#ifdef RLIMIT_DATA - /* Try to avoid eating all memory if a test leaks. */ - struct rlimit data_limit; - if (getrlimit (RLIMIT_DATA, &data_limit) == 0) - { - if (TEST_DATA_LIMIT == RLIM_INFINITY) - data_limit.rlim_cur = data_limit.rlim_max; - else if (data_limit.rlim_cur > (rlim_t) TEST_DATA_LIMIT) - data_limit.rlim_cur = MIN ((rlim_t) TEST_DATA_LIMIT, - data_limit.rlim_max); - if (setrlimit (RLIMIT_DATA, &data_limit) < 0) - printf ("setrlimit: RLIMIT_DATA: %m\n"); - } - else - printf ("getrlimit: RLIMIT_DATA: %m\n"); -#endif - /* We put the test process in its own pgrp so that if it bogusly generates any job control signals, they won't hit the whole build. */ if (setpgid (0, 0) != 0)