2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/mm.h>
|
2007-07-30 02:36:13 +04:00
|
|
|
#include <linux/fs.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/sem.h>
|
|
|
|
#include <linux/msg.h>
|
|
|
|
#include <linux/shm.h>
|
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <linux/mman.h>
|
|
|
|
#include <linux/file.h>
|
|
|
|
#include <linux/utsname.h>
|
|
|
|
#include <linux/personality.h>
|
2008-01-30 15:31:07 +03:00
|
|
|
#include <linux/random.h>
|
2008-07-29 09:48:56 +04:00
|
|
|
#include <linux/uaccess.h>
|
2011-09-28 11:42:14 +04:00
|
|
|
#include <linux/elf.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#include <asm/ia32.h>
|
2008-07-21 20:04:13 +04:00
|
|
|
#include <asm/syscalls.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-08-05 17:15:08 +04:00
|
|
|
/*
|
|
|
|
* Align a virtual address to avoid aliasing in the I$ on AMD F15h.
|
|
|
|
*
|
|
|
|
* @flags denotes the allocation direction - bottomup or topdown -
|
|
|
|
* or vDSO; see call sites below.
|
|
|
|
*/
|
|
|
|
unsigned long align_addr(unsigned long addr, struct file *filp,
|
|
|
|
enum align_flags flags)
|
|
|
|
{
|
|
|
|
unsigned long tmp_addr;
|
|
|
|
|
|
|
|
/* handle 32- and 64-bit case with a single conditional */
|
|
|
|
if (va_align.flags < 0 || !(va_align.flags & (2 - mmap_is_ia32())))
|
|
|
|
return addr;
|
|
|
|
|
|
|
|
if (!(current->flags & PF_RANDOMIZE))
|
|
|
|
return addr;
|
|
|
|
|
|
|
|
if (!((flags & ALIGN_VDSO) || filp))
|
|
|
|
return addr;
|
|
|
|
|
|
|
|
tmp_addr = addr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We need an address which is <= than the original
|
|
|
|
* one only when in topdown direction.
|
|
|
|
*/
|
|
|
|
if (!(flags & ALIGN_TOPDOWN))
|
|
|
|
tmp_addr += va_align.mask;
|
|
|
|
|
|
|
|
tmp_addr &= ~va_align.mask;
|
|
|
|
|
|
|
|
return tmp_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init control_va_addr_alignment(char *str)
|
|
|
|
{
|
|
|
|
/* guard against enabling this on other CPU families */
|
|
|
|
if (va_align.flags < 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (*str == 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (*str == '=')
|
|
|
|
str++;
|
|
|
|
|
|
|
|
if (!strcmp(str, "32"))
|
|
|
|
va_align.flags = ALIGN_VA_32;
|
|
|
|
else if (!strcmp(str, "64"))
|
|
|
|
va_align.flags = ALIGN_VA_64;
|
|
|
|
else if (!strcmp(str, "off"))
|
|
|
|
va_align.flags = 0;
|
|
|
|
else if (!strcmp(str, "on"))
|
|
|
|
va_align.flags = ALIGN_VA_32 | ALIGN_VA_64;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("align_va_addr", control_va_addr_alignment);
|
|
|
|
|
2009-08-11 00:53:11 +04:00
|
|
|
SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
|
|
|
|
unsigned long, prot, unsigned long, flags,
|
|
|
|
unsigned long, fd, unsigned long, off)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
long error;
|
|
|
|
error = -EINVAL;
|
|
|
|
if (off & ~PAGE_MASK)
|
|
|
|
goto out;
|
|
|
|
|
2009-12-01 01:37:04 +03:00
|
|
|
error = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
|
2005-04-17 02:20:36 +04:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void find_start_end(unsigned long flags, unsigned long *begin,
|
|
|
|
unsigned long *end)
|
|
|
|
{
|
2012-02-07 01:03:09 +04:00
|
|
|
if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
|
2008-01-30 15:31:07 +03:00
|
|
|
unsigned long new_begin;
|
2005-04-17 02:20:36 +04:00
|
|
|
/* This is usually used needed to map code in small
|
|
|
|
model, so it needs to be in the first 31bit. Limit
|
|
|
|
it to that. This means we need to move the
|
|
|
|
unmapped base down for this case. This can give
|
|
|
|
conflicts with the heap, but we assume that glibc
|
|
|
|
malloc knows how to fall back to mmap. Give it 1GB
|
2008-07-29 09:48:56 +04:00
|
|
|
of playground for now. -AK */
|
|
|
|
*begin = 0x40000000;
|
|
|
|
*end = 0x80000000;
|
2008-01-30 15:31:07 +03:00
|
|
|
if (current->flags & PF_RANDOMIZE) {
|
|
|
|
new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
|
|
|
|
if (new_begin)
|
|
|
|
*begin = new_begin;
|
|
|
|
}
|
[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes
Appended patch will setup compatibility mode TASK_SIZE properly. This will
fix atleast three known bugs that can be encountered while running
compatibility mode apps.
a) A malicious 32bit app can have an elf section at 0xffffe000. During
exec of this app, we will have a memory leak as insert_vm_struct() is
not checking for return value in syscall32_setup_pages() and thus not
freeing the vma allocated for the vsyscall page. And instead of exec
failing (as it has addresses > TASK_SIZE), we were allowing it to
succeed previously.
b) With a 32bit app, hugetlb_get_unmapped_area/arch_get_unmapped_area
may return addresses beyond 32bits, ultimately causing corruption
because of wrap-around and resulting in SEGFAULT, instead of returning
ENOMEM.
c) 32bit app doing this below mmap will now fail.
mmap((void *)(0xFFFFE000UL), 0x10000UL, PROT_READ|PROT_WRITE,
MAP_FIXED|MAP_PRIVATE|MAP_ANON, 0, 0);
Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:14:32 +04:00
|
|
|
} else {
|
|
|
|
*begin = TASK_UNMAPPED_BASE;
|
2008-07-29 09:48:56 +04:00
|
|
|
*end = TASK_SIZE;
|
[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes
Appended patch will setup compatibility mode TASK_SIZE properly. This will
fix atleast three known bugs that can be encountered while running
compatibility mode apps.
a) A malicious 32bit app can have an elf section at 0xffffe000. During
exec of this app, we will have a memory leak as insert_vm_struct() is
not checking for return value in syscall32_setup_pages() and thus not
freeing the vma allocated for the vsyscall page. And instead of exec
failing (as it has addresses > TASK_SIZE), we were allowing it to
succeed previously.
b) With a 32bit app, hugetlb_get_unmapped_area/arch_get_unmapped_area
may return addresses beyond 32bits, ultimately causing corruption
because of wrap-around and resulting in SEGFAULT, instead of returning
ENOMEM.
c) 32bit app doing this below mmap will now fail.
mmap((void *)(0xFFFFE000UL), 0x10000UL, PROT_READ|PROT_WRITE,
MAP_FIXED|MAP_PRIVATE|MAP_ANON, 0, 0);
Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:14:32 +04:00
|
|
|
}
|
2008-07-29 09:48:56 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
unsigned long
|
|
|
|
arch_get_unmapped_area(struct file *filp, unsigned long addr,
|
|
|
|
unsigned long len, unsigned long pgoff, unsigned long flags)
|
|
|
|
{
|
|
|
|
struct mm_struct *mm = current->mm;
|
|
|
|
struct vm_area_struct *vma;
|
|
|
|
unsigned long start_addr;
|
|
|
|
unsigned long begin, end;
|
2008-07-29 09:48:56 +04:00
|
|
|
|
2007-05-07 01:50:11 +04:00
|
|
|
if (flags & MAP_FIXED)
|
|
|
|
return addr;
|
|
|
|
|
2008-07-29 09:48:56 +04:00
|
|
|
find_start_end(flags, &begin, &end);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (len > end)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (addr) {
|
|
|
|
addr = PAGE_ALIGN(addr);
|
|
|
|
vma = find_vma(mm, addr);
|
|
|
|
if (end - len >= addr &&
|
|
|
|
(!vma || addr + len <= vma->vm_start))
|
|
|
|
return addr;
|
|
|
|
}
|
2012-02-07 01:03:09 +04:00
|
|
|
if (((flags & MAP_32BIT) || test_thread_flag(TIF_ADDR32))
|
2005-06-22 04:14:49 +04:00
|
|
|
&& len <= mm->cached_hole_size) {
|
2008-07-29 09:48:56 +04:00
|
|
|
mm->cached_hole_size = 0;
|
2005-06-22 04:14:49 +04:00
|
|
|
mm->free_area_cache = begin;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
addr = mm->free_area_cache;
|
2008-07-29 09:48:56 +04:00
|
|
|
if (addr < begin)
|
|
|
|
addr = begin;
|
2005-04-17 02:20:36 +04:00
|
|
|
start_addr = addr;
|
|
|
|
|
|
|
|
full_search:
|
2011-08-05 17:15:08 +04:00
|
|
|
|
|
|
|
addr = align_addr(addr, filp, 0);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
|
|
|
|
/* At this point: (!vma || addr < vma->vm_end). */
|
|
|
|
if (end - len < addr) {
|
|
|
|
/*
|
|
|
|
* Start a new search - just in case we missed
|
|
|
|
* some holes.
|
|
|
|
*/
|
|
|
|
if (start_addr != begin) {
|
|
|
|
start_addr = addr = begin;
|
2005-06-22 04:14:49 +04:00
|
|
|
mm->cached_hole_size = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
goto full_search;
|
|
|
|
}
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
if (!vma || addr + len <= vma->vm_start) {
|
|
|
|
/*
|
|
|
|
* Remember the place where we stopped the search:
|
|
|
|
*/
|
|
|
|
mm->free_area_cache = addr + len;
|
|
|
|
return addr;
|
|
|
|
}
|
2005-06-22 04:14:49 +04:00
|
|
|
if (addr + mm->cached_hole_size < vma->vm_start)
|
2008-07-29 09:48:56 +04:00
|
|
|
mm->cached_hole_size = vma->vm_start - addr;
|
2005-06-22 04:14:49 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
addr = vma->vm_end;
|
2011-08-05 17:15:08 +04:00
|
|
|
addr = align_addr(addr, filp, 0);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-30 15:31:07 +03:00
|
|
|
|
|
|
|
unsigned long
|
|
|
|
arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
|
|
|
|
const unsigned long len, const unsigned long pgoff,
|
|
|
|
const unsigned long flags)
|
|
|
|
{
|
|
|
|
struct vm_area_struct *vma;
|
|
|
|
struct mm_struct *mm = current->mm;
|
|
|
|
unsigned long addr = addr0;
|
|
|
|
|
|
|
|
/* requested length too big for entire address space */
|
|
|
|
if (len > TASK_SIZE)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (flags & MAP_FIXED)
|
|
|
|
return addr;
|
|
|
|
|
|
|
|
/* for MAP_32BIT mappings we force the legact mmap base */
|
2012-02-07 01:03:09 +04:00
|
|
|
if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
|
2008-01-30 15:31:07 +03:00
|
|
|
goto bottomup;
|
|
|
|
|
|
|
|
/* requesting a specific address */
|
|
|
|
if (addr) {
|
|
|
|
addr = PAGE_ALIGN(addr);
|
|
|
|
vma = find_vma(mm, addr);
|
|
|
|
if (TASK_SIZE - len >= addr &&
|
|
|
|
(!vma || addr + len <= vma->vm_start))
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check if free_area_cache is useful for us */
|
|
|
|
if (len <= mm->cached_hole_size) {
|
x86: PIE executable randomization, checkpatch fixes
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: no space between function name and open parenthesis '('
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: line over 80 characters
#67: FILE: arch/x86/kernel/sys_x86_64.c:80:
+ new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
ERROR: use tabs not spaces
#110: FILE: arch/x86/kernel/sys_x86_64.c:185:
+ ^I mm->cached_hole_size = 0;$
ERROR: use tabs not spaces
#111: FILE: arch/x86/kernel/sys_x86_64.c:186:
+ ^I^Imm->free_area_cache = mm->mmap_base;$
ERROR: use tabs not spaces
#112: FILE: arch/x86/kernel/sys_x86_64.c:187:
+ ^I}$
ERROR: use tabs not spaces
#141: FILE: arch/x86/kernel/sys_x86_64.c:216:
+ ^I^I/* remember the largest hole we saw so far */$
ERROR: use tabs not spaces
#142: FILE: arch/x86/kernel/sys_x86_64.c:217:
+ ^I^Iif (addr + mm->cached_hole_size < vma->vm_start)$
ERROR: use tabs not spaces
#143: FILE: arch/x86/kernel/sys_x86_64.c:218:
+ ^I^I mm->cached_hole_size = vma->vm_start - addr;$
ERROR: use tabs not spaces
#157: FILE: arch/x86/kernel/sys_x86_64.c:232:
+ ^Imm->free_area_cache = TASK_UNMAPPED_BASE;$
ERROR: need a space before the open parenthesis '('
#291: FILE: arch/x86/mm/mmap_64.c:101:
+ } else if(mmap_is_legacy()) {
WARNING: braces {} are not necessary for single statement blocks
#302: FILE: arch/x86/mm/mmap_64.c:112:
+ if (current->flags & PF_RANDOMIZE) {
+ mm->mmap_base += ((long)rnd) << PAGE_SHIFT;
+ }
WARNING: line over 80 characters
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: no space between function name and open parenthesis '('
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: line over 80 characters
#429: FILE: fs/binfmt_elf.c:438:
+ eppnt, elf_prot, elf_type, total_size);
ERROR: need space after that ',' (ctx:VxV)
#480: FILE: fs/binfmt_elf.c:939:
+ elf_prot, elf_flags,0);
^
total: 9 errors, 7 warnings, 461 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 15:31:07 +03:00
|
|
|
mm->cached_hole_size = 0;
|
|
|
|
mm->free_area_cache = mm->mmap_base;
|
|
|
|
}
|
2008-01-30 15:31:07 +03:00
|
|
|
|
|
|
|
/* either no address requested or can't fit in requested address hole */
|
|
|
|
addr = mm->free_area_cache;
|
|
|
|
|
|
|
|
/* make sure it can fit in the remaining address space */
|
|
|
|
if (addr > len) {
|
2011-08-05 17:15:08 +04:00
|
|
|
unsigned long tmp_addr = align_addr(addr - len, filp,
|
|
|
|
ALIGN_TOPDOWN);
|
|
|
|
|
|
|
|
vma = find_vma(mm, tmp_addr);
|
|
|
|
if (!vma || tmp_addr + len <= vma->vm_start)
|
2008-01-30 15:31:07 +03:00
|
|
|
/* remember the address as a hint for next time */
|
2011-08-05 17:15:08 +04:00
|
|
|
return mm->free_area_cache = tmp_addr;
|
2008-01-30 15:31:07 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mm->mmap_base < len)
|
|
|
|
goto bottomup;
|
|
|
|
|
|
|
|
addr = mm->mmap_base-len;
|
|
|
|
|
|
|
|
do {
|
2011-08-05 17:15:08 +04:00
|
|
|
addr = align_addr(addr, filp, ALIGN_TOPDOWN);
|
|
|
|
|
2008-01-30 15:31:07 +03:00
|
|
|
/*
|
|
|
|
* Lookup failure means no vma is above this address,
|
|
|
|
* else if new region fits below vma->vm_start,
|
|
|
|
* return with success:
|
|
|
|
*/
|
|
|
|
vma = find_vma(mm, addr);
|
|
|
|
if (!vma || addr+len <= vma->vm_start)
|
|
|
|
/* remember the address as a hint for next time */
|
2008-07-29 09:48:56 +04:00
|
|
|
return mm->free_area_cache = addr;
|
2008-01-30 15:31:07 +03:00
|
|
|
|
x86: PIE executable randomization, checkpatch fixes
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: no space between function name and open parenthesis '('
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: line over 80 characters
#67: FILE: arch/x86/kernel/sys_x86_64.c:80:
+ new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
ERROR: use tabs not spaces
#110: FILE: arch/x86/kernel/sys_x86_64.c:185:
+ ^I mm->cached_hole_size = 0;$
ERROR: use tabs not spaces
#111: FILE: arch/x86/kernel/sys_x86_64.c:186:
+ ^I^Imm->free_area_cache = mm->mmap_base;$
ERROR: use tabs not spaces
#112: FILE: arch/x86/kernel/sys_x86_64.c:187:
+ ^I}$
ERROR: use tabs not spaces
#141: FILE: arch/x86/kernel/sys_x86_64.c:216:
+ ^I^I/* remember the largest hole we saw so far */$
ERROR: use tabs not spaces
#142: FILE: arch/x86/kernel/sys_x86_64.c:217:
+ ^I^Iif (addr + mm->cached_hole_size < vma->vm_start)$
ERROR: use tabs not spaces
#143: FILE: arch/x86/kernel/sys_x86_64.c:218:
+ ^I^I mm->cached_hole_size = vma->vm_start - addr;$
ERROR: use tabs not spaces
#157: FILE: arch/x86/kernel/sys_x86_64.c:232:
+ ^Imm->free_area_cache = TASK_UNMAPPED_BASE;$
ERROR: need a space before the open parenthesis '('
#291: FILE: arch/x86/mm/mmap_64.c:101:
+ } else if(mmap_is_legacy()) {
WARNING: braces {} are not necessary for single statement blocks
#302: FILE: arch/x86/mm/mmap_64.c:112:
+ if (current->flags & PF_RANDOMIZE) {
+ mm->mmap_base += ((long)rnd) << PAGE_SHIFT;
+ }
WARNING: line over 80 characters
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: no space between function name and open parenthesis '('
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: line over 80 characters
#429: FILE: fs/binfmt_elf.c:438:
+ eppnt, elf_prot, elf_type, total_size);
ERROR: need space after that ',' (ctx:VxV)
#480: FILE: fs/binfmt_elf.c:939:
+ elf_prot, elf_flags,0);
^
total: 9 errors, 7 warnings, 461 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 15:31:07 +03:00
|
|
|
/* remember the largest hole we saw so far */
|
|
|
|
if (addr + mm->cached_hole_size < vma->vm_start)
|
|
|
|
mm->cached_hole_size = vma->vm_start - addr;
|
2008-01-30 15:31:07 +03:00
|
|
|
|
|
|
|
/* try just below the current vma->vm_start */
|
|
|
|
addr = vma->vm_start-len;
|
|
|
|
} while (len < vma->vm_start);
|
|
|
|
|
|
|
|
bottomup:
|
|
|
|
/*
|
|
|
|
* A failed mmap() very likely causes application failure,
|
|
|
|
* so fall back to the bottom-up function here. This scenario
|
|
|
|
* can happen with large stack limits and large mmap()
|
|
|
|
* allocations.
|
|
|
|
*/
|
|
|
|
mm->cached_hole_size = ~0UL;
|
x86: PIE executable randomization, checkpatch fixes
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: no space between function name and open parenthesis '('
#39: FILE: arch/ia64/ia32/binfmt_elf32.c:229:
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
WARNING: line over 80 characters
#67: FILE: arch/x86/kernel/sys_x86_64.c:80:
+ new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
ERROR: use tabs not spaces
#110: FILE: arch/x86/kernel/sys_x86_64.c:185:
+ ^I mm->cached_hole_size = 0;$
ERROR: use tabs not spaces
#111: FILE: arch/x86/kernel/sys_x86_64.c:186:
+ ^I^Imm->free_area_cache = mm->mmap_base;$
ERROR: use tabs not spaces
#112: FILE: arch/x86/kernel/sys_x86_64.c:187:
+ ^I}$
ERROR: use tabs not spaces
#141: FILE: arch/x86/kernel/sys_x86_64.c:216:
+ ^I^I/* remember the largest hole we saw so far */$
ERROR: use tabs not spaces
#142: FILE: arch/x86/kernel/sys_x86_64.c:217:
+ ^I^Iif (addr + mm->cached_hole_size < vma->vm_start)$
ERROR: use tabs not spaces
#143: FILE: arch/x86/kernel/sys_x86_64.c:218:
+ ^I^I mm->cached_hole_size = vma->vm_start - addr;$
ERROR: use tabs not spaces
#157: FILE: arch/x86/kernel/sys_x86_64.c:232:
+ ^Imm->free_area_cache = TASK_UNMAPPED_BASE;$
ERROR: need a space before the open parenthesis '('
#291: FILE: arch/x86/mm/mmap_64.c:101:
+ } else if(mmap_is_legacy()) {
WARNING: braces {} are not necessary for single statement blocks
#302: FILE: arch/x86/mm/mmap_64.c:112:
+ if (current->flags & PF_RANDOMIZE) {
+ mm->mmap_base += ((long)rnd) << PAGE_SHIFT;
+ }
WARNING: line over 80 characters
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: no space between function name and open parenthesis '('
#314: FILE: fs/binfmt_elf.c:48:
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
WARNING: line over 80 characters
#429: FILE: fs/binfmt_elf.c:438:
+ eppnt, elf_prot, elf_type, total_size);
ERROR: need space after that ',' (ctx:VxV)
#480: FILE: fs/binfmt_elf.c:939:
+ elf_prot, elf_flags,0);
^
total: 9 errors, 7 warnings, 461 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 15:31:07 +03:00
|
|
|
mm->free_area_cache = TASK_UNMAPPED_BASE;
|
2008-01-30 15:31:07 +03:00
|
|
|
addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
|
|
|
|
/*
|
|
|
|
* Restore the topdown base:
|
|
|
|
*/
|
|
|
|
mm->free_area_cache = mm->mmap_base;
|
|
|
|
mm->cached_hole_size = ~0UL;
|
|
|
|
|
|
|
|
return addr;
|
|
|
|
}
|