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>

2 files changed, 3 insertions, 4 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)
 {
         if (ARCH_SUN4C_SUN4 &&
             (len > 0x20000000 ||
-             ((flags & MAP_FIXED) &&
-              addr < 0xe0000000 && addr + len > 0x20000000)))
+             (addr < 0xe0000000 && addr + len > 0x20000000)))
                 return -EINVAL;
 
         /* See asm-sparc/uaccess.h */
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,
                 if (len >= STACK_TOP32)
                         return -EINVAL;
 
-                if ((flags & MAP_FIXED) && addr > STACK_TOP32 - len)
+                if (addr > STACK_TOP32 - len)
                         return -EINVAL;
         } else {
                 if (len >= VA_EXCLUDE_START)
                         return -EINVAL;
 
-                if ((flags & MAP_FIXED) && invalid_64bit_range(addr, len))
+                if (invalid_64bit_range(addr, len))
                         return -EINVAL;
         }