|
@@ -1856,7 +1856,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)
|
|
@@ -1865,7 +1865,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;
|
|
|
}
|
|
@@ -1895,7 +1895,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)
|
|
@@ -1905,14 +1905,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);
|