diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-11-30 17:00:51 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-11 06:34:10 -0500 |
| commit | 564b3bffc619dcbdd160de597b0547a7017ea010 (patch) | |
| tree | b6980ff0a3d74a7834fd6332a3c85d2c8d6ac81b | |
| parent | 570dcf2c15463842e384eb597a87c1e39bead99b (diff) | |
| download | op-kernel-dev-564b3bffc619dcbdd160de597b0547a7017ea010.zip op-kernel-dev-564b3bffc619dcbdd160de597b0547a7017ea010.tar.gz | |
arch_mmap_check() on mn10300
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/mn10300/include/asm/mman.h | 5 | ||||
| -rw-r--r-- | arch/mn10300/kernel/sys_mn10300.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mn10300/include/asm/mman.h b/arch/mn10300/include/asm/mman.h index 8eebf89..db5c53da 100644 --- a/arch/mn10300/include/asm/mman.h +++ b/arch/mn10300/include/asm/mman.h @@ -1 +1,6 @@ #include <asm-generic/mman.h> + +#define MIN_MAP_ADDR PAGE_SIZE /* minimum fixed mmap address */ + +#define arch_mmap_check(addr, len, flags) \ + (((flags) & MAP_FIXED && (addr) < MIN_MAP_ADDR) ? -EINVAL : 0) diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c index 8ca5af0..ec4100d 100644 --- a/arch/mn10300/kernel/sys_mn10300.c +++ b/arch/mn10300/kernel/sys_mn10300.c @@ -23,8 +23,6 @@ #include <asm/uaccess.h> -#define MIN_MAP_ADDR PAGE_SIZE /* minimum fixed mmap address */ - /* * memory mapping syscall */ @@ -37,9 +35,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); - if (flags & MAP_FIXED && addr < MIN_MAP_ADDR) - goto out; - error = -EBADF; if (!(flags & MAP_ANONYMOUS)) { file = fget(fd); |
