aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm26/kernel/sys_arm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm26/kernel/sys_arm.c b/arch/arm26/kernel/sys_arm.c
index e7edd201579a..85457897b8a9 100644
--- a/arch/arm26/kernel/sys_arm.c
+++ b/arch/arm26/kernel/sys_arm.c
@@ -64,10 +64,10 @@ inline long do_mmap2(
64 flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); 64 flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
65 65
66 /* 66 /*
67 * If we are doing a fixed mapping, and address < PAGE_SIZE, 67 * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
68 * then deny it. 68 * then deny it.
69 */ 69 */
70 if (flags & MAP_FIXED && addr < PAGE_SIZE && vectors_base() == 0) 70 if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
71 goto out; 71 goto out;
72 72
73 error = -EBADF; 73 error = -EBADF;
@@ -121,11 +121,10 @@ sys_arm_mremap(unsigned long addr, unsigned long old_len,
121 unsigned long ret = -EINVAL; 121 unsigned long ret = -EINVAL;
122 122
123 /* 123 /*
124 * If we are doing a fixed mapping, and address < PAGE_SIZE, 124 * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
125 * then deny it. 125 * then deny it.
126 */ 126 */
127 if (flags & MREMAP_FIXED && new_addr < PAGE_SIZE && 127 if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
128 vectors_base() == 0)
129 goto out; 128 goto out;
130 129
131 down_write(&current->mm->mmap_sem); 130 down_write(&current->mm->mmap_sem);