aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-10-26 19:49:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 10:39:27 -0400
commit41e20983fe553b39bc2b00e07c7a379f0c86a4bc (patch)
tree685433b37a7ebe5a61ac7315dc8017706227345b
parentb76146ed1ae7d7acae1d51f9342e31d00c8d5a12 (diff)
vmscan: limit VM_EXEC protection to file pages
It is possible to have !Anon but SwapBacked pages, and some apps could create huge number of such pages with MAP_SHARED|MAP_ANONYMOUS. These pages go into the ANON lru list, and hence shall not be protected: we only care mapped executable files. Failing to do so may trigger OOM. Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index fbb9f6bdad6e..fbcac3bdcf19 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1356,7 +1356,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
1356 * IO, plus JVM can create lots of anon VM_EXEC pages, 1356 * IO, plus JVM can create lots of anon VM_EXEC pages,
1357 * so we ignore them here. 1357 * so we ignore them here.
1358 */ 1358 */
1359 if ((vm_flags & VM_EXEC) && !PageAnon(page)) { 1359 if ((vm_flags & VM_EXEC) && page_is_file_cache(page)) {
1360 list_add(&page->lru, &l_active); 1360 list_add(&page->lru, &l_active);
1361 continue; 1361 continue;
1362 } 1362 }