public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] mm: recheck lock rlim after f_op->mmap() method
@ 2007-07-09 18:49 Dmitry Monakhov
  2007-07-10 17:27 ` Hugh Dickins
  2007-07-13  8:13 ` Andrew Morton
  0 siblings, 2 replies; 13+ messages in thread
From: Dmitry Monakhov @ 2007-07-09 18:49 UTC (permalink / raw)
  To: Linux Kernel Mailing List

Some device drivers can change vm_flags in their f_op->mmap
method. In order to be on the safe side we have to recheck
lock rlimit. Now we have to check lock rlimit from two places,
let's move this common code to helper functon.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 mm/mmap.c |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 906ed40..5c89f1d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -885,6 +885,18 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
 }
 #endif /* CONFIG_PROC_FS */
 
+static int check_lock_limit(unsigned long delta, struct mm_struct* mm)
+{
+	unsigned long locked, lock_limit;
+	locked = delta >> PAGE_SHIFT;
+	locked += mm->locked_vm;
+	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+	lock_limit >>= PAGE_SHIFT;
+	if (locked > lock_limit && !capable(CAP_IPC_LOCK))
+		return -EAGAIN;
+	return 0;
+}
+
 /*
  * The caller must hold down_write(current->mm->mmap_sem).
  */
@@ -954,13 +966,9 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
 	}
 	/* mlock MCL_FUTURE? */
 	if (vm_flags & VM_LOCKED) {
-		unsigned long locked, lock_limit;
-		locked = len >> PAGE_SHIFT;
-		locked += mm->locked_vm;
-		lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
-		lock_limit >>= PAGE_SHIFT;
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
-			return -EAGAIN;
+		error = check_lock_limit(len, mm);
+		if (error)
+			return error;
 	}
 
 	inode = file ? file->f_path.dentry->d_inode : NULL;
@@ -1101,6 +1109,17 @@ munmap_back:
 		error = file->f_op->mmap(file, vma);
 		if (error)
 			goto unmap_and_free_vma;
+		
+		if (vma->vm_flags & VM_LOCKED
+				&& !(vm_flags & VM_LOCKED)) {
+		/*
+		 * VM_LOCKED was added in f_op->mmap() method,
+		 * so we have to recheck limit.
+		 */
+			error = check_lock_limit(len, mm);
+			if (error)
+				goto unmap_and_free_vma;
+		}
 	} else if (vm_flags & VM_SHARED) {
 		error = shmem_zero_setup(vma);
 		if (error)
-- 
1.5.2.2



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2007-07-13 13:03 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-09 18:49 [patch] mm: recheck lock rlim after f_op->mmap() method Dmitry Monakhov
2007-07-10 17:27 ` Hugh Dickins
2007-07-10 17:53   ` Dmitry Monakhov
2007-07-10 19:48     ` Hugh Dickins
2007-07-11  8:39   ` Jes Sorensen
2007-07-11 18:24     ` Hugh Dickins
2007-07-11  9:32   ` Christoph Hellwig
2007-07-11 10:12     ` Dmitry Monakhov
2007-07-11 10:14       ` Christoph Hellwig
2007-07-11 18:03         ` Hugh Dickins
2007-07-13  9:53           ` Christoph Hellwig
2007-07-13  8:13 ` Andrew Morton
2007-07-13 13:02   ` Hugh Dickins

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox