X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Fmlock.c;fp=mm%2Fmlock.c;h=2b4bf4d421fc864717bf9d156dff06899b48d7fc;hb=a8e794ca871505c8ea96cc102f4ad555c5231d7f;hp=0cf446b5f38323c3b20c7242b52db103d16756aa;hpb=b76fcd5f0c655b6e3e9bf534594357025421c66a;p=linux-2.6.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 0cf446b5f..2b4bf4d42 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -100,7 +100,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
 
 asmlinkage long sys_mlock(unsigned long start, size_t len)
 {
-	unsigned long locked;
+	unsigned long locked, grow;
 	unsigned long lock_limit;
 	int error = -ENOMEM;
 
@@ -108,8 +108,10 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
 	len = PAGE_ALIGN(len + (start & ~PAGE_MASK));
 	start &= PAGE_MASK;
 
-	locked = len >> PAGE_SHIFT;
-	locked += current->mm->locked_vm;
+	grow = len >> PAGE_SHIFT;
+	if (!vx_vmlocked_avail(current->mm, grow))
+		goto out;
+	locked = current->mm->locked_vm + grow;
 
 	lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
 	lock_limit >>= PAGE_SHIFT;
@@ -117,6 +119,7 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
 	/* check against resource limits */
 	if (locked <= lock_limit)
 		error = do_mlock(start, len, 1);
+out:
 	up_write(&current->mm->mmap_sem);
 	return error;
 }
@@ -174,6 +177,9 @@ asmlinkage long sys_mlockall(int flags)
 	lock_limit >>= PAGE_SHIFT;
 
 	ret = -ENOMEM;
+	if (!vx_vmlocked_avail(current->mm, current->mm->total_vm))
+		goto out;
+	/* check vserver lock limits? */
 	if (current->mm->total_vm <= lock_limit)
 		ret = do_mlockall(flags);
 out: