From: Chris Wright <chrisw@osdl.org>
Always use page counts when doing RLIMIT_MEMLOCK checking to avoid possible
overflow.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
mm/mmap.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff -puN mm/mmap.c~rlimit_memlock-checking-fix mm/mmap.c
--- 25/mm/mmap.c~rlimit_memlock-checking-fix 2005-04-27 00:01:36.326944320 -0700
+++ 25-akpm/mm/mmap.c 2005-04-27 00:01:36.330943712 -0700
@@ -937,9 +937,10 @@ unsigned long do_mmap_pgoff(struct file
/* mlock MCL_FUTURE? */
if (vm_flags & VM_LOCKED) {
unsigned long locked, lock_limit;
- locked = mm->locked_vm << PAGE_SHIFT;
+ locked = len >> PAGE_SHIFT;
+ locked += mm->locked_vm;
lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
- locked += len;
+ lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
@@ -1822,9 +1823,10 @@ unsigned long do_brk(unsigned long addr,
*/
if (mm->def_flags & VM_LOCKED) {
unsigned long locked, lock_limit;
- locked = mm->locked_vm << PAGE_SHIFT;
+ locked = len >> PAGE_SHIFT;
+ locked += mm->locked_vm;
lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
- locked += len;
+ lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
_