rpms/kernel/F-9 linux-2.6.25-sparc64-mmap_check_fix.patch, NONE, 1.1 kernel.spec, 1.634, 1.635

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8701

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.25-sparc64-mmap_check_fix.patch 
Log Message:
Fix sparc64 kernel crash in mmap_check (Dave Miller)

linux-2.6.25-sparc64-mmap_check_fix.patch:

--- NEW FILE linux-2.6.25-sparc64-mmap_check_fix.patch ---
--- 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 */
--- 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;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- kernel.spec	7 May 2008 06:45:07 -0000	1.634
+++ kernel.spec	7 May 2008 13:22:36 -0000	1.635
@@ -589,6 +589,7 @@
 Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch150: linux-2.6.25-sparc64-semctl.patch
+Patch151: linux-2.6.25-sparc64-mmap_check_fix.patch
 
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
@@ -1059,6 +1060,7 @@
 # SPARC64
 #
 ApplyPatch linux-2.6.25-sparc64-semctl.patch
+ApplyPatch linux-2.6.25-sparc64-mmap_check_fix.patch
 
 #
 # Exec shield
@@ -1800,6 +1802,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed May 07 2008 Tom "spot" Callaway <tcallawa at redhat.com>
+- Fix sparc64 kernel crash in mmap_check (Dave Miller)
+
 * Wed May 07 2008 Kyle McMartin <kmcmartin at redhat.com>
 - Linux 2.6.25.2