aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-07 05:24:28 -0400
committerDavid S. Miller <davem@davemloft.net>2008-05-07 05:24:28 -0400
commit5816339310b2d9623cf413d33e538b45e815da5d (patch)
tree268187469afc7e9eae439ef613f0c9f86f5e91ba /arch/sparc64
parentd45100f7b69e3d9cd0cd5e956b6ac2c78d460d07 (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/sparc64')
-rw-r--r--arch/sparc64/kernel/sys_sparc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 8d4761f15fa9..0dbc941f130e 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -549,13 +549,13 @@ int sparc64_mmap_check(unsigned long addr, unsigned long len,
549 if (len >= STACK_TOP32) 549 if (len >= STACK_TOP32)
550 return -EINVAL; 550 return -EINVAL;
551 551
552 if ((flags & MAP_FIXED) && addr > STACK_TOP32 - len) 552 if (addr > STACK_TOP32 - len)
553 return -EINVAL; 553 return -EINVAL;
554 } else { 554 } else {
555 if (len >= VA_EXCLUDE_START) 555 if (len >= VA_EXCLUDE_START)
556 return -EINVAL; 556 return -EINVAL;
557 557
558 if ((flags & MAP_FIXED) && invalid_64bit_range(addr, len)) 558 if (invalid_64bit_range(addr, len))
559 return -EINVAL; 559 return -EINVAL;
560 } 560 }
561 561