From 45ae0f56196d11f9b7954ac9724734d8869940c5 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Thu, 7 Jun 2012 14:21:11 -0700
Subject: [PATCH] --- yaml --- r: 310549 b: refs/heads/master c:
 1ad75b9e16280ca4e2501a629a225319cf2eef2e h: refs/heads/master i:   310547:
 1a69a8aa535058891f9a775ace49bbf3cf6b26b2 v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6bf93fd987ad..7a6524d87060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bafb282df29c1524b1617019adebd6d0c3eb7a47
+refs/heads/master: 1ad75b9e16280ca4e2501a629a225319cf2eef2e
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 54f20fdee93c..19a2c7139960 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1869,7 +1869,7 @@ static int prctl_set_mm(int opt, unsigned long addr,
 	if (opt == PR_SET_MM_EXE_FILE)
 		return prctl_set_mm_exe_file(mm, (unsigned int)addr);
 
-	if (addr >= TASK_SIZE)
+	if (addr >= TASK_SIZE || addr < mmap_min_addr)
 		return -EINVAL;
 
 	error = -EINVAL;