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 /arch/mn10300 | |
parent | 570dcf2c15463842e384eb597a87c1e39bead99b (diff) |
arch_mmap_check() on mn10300
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mn10300')
-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 8eebf89f5ab1..db5c53da73ce 100644 --- a/arch/mn10300/include/asm/mman.h +++ b/arch/mn10300/include/asm/mman.h | |||
@@ -1 +1,6 @@ | |||
1 | #include <asm-generic/mman.h> | 1 | #include <asm-generic/mman.h> |
2 | |||
3 | #define MIN_MAP_ADDR PAGE_SIZE /* minimum fixed mmap address */ | ||
4 | |||
5 | #define arch_mmap_check(addr, len, flags) \ | ||
6 | (((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 8ca5af00334c..ec4100dfcb7d 100644 --- a/arch/mn10300/kernel/sys_mn10300.c +++ b/arch/mn10300/kernel/sys_mn10300.c | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
25 | 25 | ||
26 | #define MIN_MAP_ADDR PAGE_SIZE /* minimum fixed mmap address */ | ||
27 | |||
28 | /* | 26 | /* |
29 | * memory mapping syscall | 27 | * memory mapping syscall |
30 | */ | 28 | */ |
@@ -37,9 +35,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
37 | 35 | ||
38 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); | 36 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); |
39 | 37 | ||
40 | if (flags & MAP_FIXED && addr < MIN_MAP_ADDR) | ||
41 | goto out; | ||
42 | |||
43 | error = -EBADF; | 38 | error = -EBADF; |
44 | if (!(flags & MAP_ANONYMOUS)) { | 39 | if (!(flags & MAP_ANONYMOUS)) { |
45 | file = fget(fd); | 40 | file = fget(fd); |