|
@@ -1102,28 +1102,22 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
|
|
|
return mmap_region(file, addr, len, flags, vm_flags, pgoff);
|
|
|
}
|
|
|
|
|
|
-static unsigned long do_mmap(struct file *file, unsigned long addr,
|
|
|
+unsigned long vm_mmap(struct file *file, unsigned long addr,
|
|
|
unsigned long len, unsigned long prot,
|
|
|
unsigned long flag, unsigned long offset)
|
|
|
{
|
|
|
+ unsigned long ret;
|
|
|
+ struct mm_struct *mm = current->mm;
|
|
|
+
|
|
|
if (unlikely(offset + PAGE_ALIGN(len) < offset))
|
|
|
return -EINVAL;
|
|
|
if (unlikely(offset & ~PAGE_MASK))
|
|
|
return -EINVAL;
|
|
|
- return do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
|
|
|
-}
|
|
|
-
|
|
|
-unsigned long vm_mmap(struct file *file, unsigned long addr,
|
|
|
- unsigned long len, unsigned long prot,
|
|
|
- unsigned long flag, unsigned long offset)
|
|
|
-{
|
|
|
- unsigned long ret;
|
|
|
- struct mm_struct *mm = current->mm;
|
|
|
|
|
|
ret = security_mmap_file(file, prot, flag);
|
|
|
if (!ret) {
|
|
|
down_write(&mm->mmap_sem);
|
|
|
- ret = do_mmap(file, addr, len, prot, flag, offset);
|
|
|
+ ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
|
|
|
up_write(&mm->mmap_sem);
|
|
|
}
|
|
|
return ret;
|