diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-07 05:24:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-07 05:24:28 -0400 |
| commit | 5816339310b2d9623cf413d33e538b45e815da5d (patch) | |
| tree | 268187469afc7e9eae439ef613f0c9f86f5e91ba /arch/sparc | |
| parent | d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07 (diff) | |
sparc: Fix mmap VA span checking.
We should not conditionalize VA range checks on MAP_FIXED.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index f188b5dc9fd0..e995491c4436 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c | |||
| @@ -223,8 +223,7 @@ int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) | |||
| 223 | { | 223 | { |
| 224 | if (ARCH_SUN4C_SUN4 && | 224 | if (ARCH_SUN4C_SUN4 && |
| 225 | (len > 0x20000000 || | 225 | (len > 0x20000000 || |
| 226 | ((flags & MAP_FIXED) && | 226 | (addr < 0xe0000000 && addr + len > 0x20000000))) |
| 227 | addr < 0xe0000000 && addr + len > 0x20000000))) | ||
| 228 | return -EINVAL; | 227 | return -EINVAL; |
| 229 | 228 | ||
| 230 | /* See asm-sparc/uaccess.h */ | 229 | /* See asm-sparc/uaccess.h */ |