Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=c...

Commit:     5816339310b2d9623cf413d33e538b45e815da5d

Parent:     d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07

Author:     David S. Miller <davem@davemloft.net>

AuthorDate: Wed May 7 02:24:28 2008 -0700

Committer:  David S. Miller <davem@davemloft.net>

CommitDate: Wed May 7 02:24:28 2008 -0700
    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>

---

 arch/sparc/kernel/sys_sparc.c   |    3 +--

 arch/sparc64/kernel/sys_sparc.c |    4 ++--

 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c

index f188b5d..e995491 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 8d4761f..0dbc941 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;

 	}
--