diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
| commit | a8eb5f1e4b10d8b7992ed0e6c0915687339201c3 (patch) | |
| tree | 69dbf24ffe53feb88b2189d22f6092314daa8231 /mm | |
| parent | 302774e6db8e9845bf065a781237a2bb808186bb (diff) | |
| parent | dffe2a3eed105c631500778dfaba0998d7bf8512 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts (add/add):
drivers/input/evdev.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index e90411b9ebe..9aa554b7e62 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1860,7 +1860,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, struct vm_area_struct *vma; struct vm_unmapped_area_info info; - if (len > TASK_SIZE) + if (len > TASK_SIZE - mmap_min_addr) return -ENOMEM; if (flags & MAP_FIXED) @@ -1869,7 +1869,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <= vma->vm_start)) return addr; } @@ -1908,7 +1908,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, struct vm_unmapped_area_info info; /* requested length too big for entire address space */ - if (len > TASK_SIZE) + if (len > TASK_SIZE - mmap_min_addr) return -ENOMEM; if (flags & MAP_FIXED) @@ -1918,14 +1918,14 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <= vma->vm_start)) return addr; } info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; - info.low_limit = PAGE_SIZE; + info.low_limit = max(PAGE_SIZE, mmap_min_addr); info.high_limit = mm->mmap_base; info.align_mask = 0; addr = vm_unmapped_area(&info); |