rpms/kernel/devel kernel-2.6.spec, 1.3209, 1.3210 linux-2.6-execshield.patch, 1.55, 1.56

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24349

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
Log Message:
* Wed Jun 06 2007 Dave Jones <davej at redhat.com>
- Fix bug with MAP_FIXED (#242612).



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3209
retrieving revision 1.3210
diff -u -r1.3209 -r1.3210
--- kernel-2.6.spec	6 Jun 2007 07:19:27 -0000	1.3209
+++ kernel-2.6.spec	6 Jun 2007 21:55:41 -0000	1.3210
@@ -2046,6 +2046,9 @@
 
 %changelog
 * Wed Jun 06 2007 Dave Jones <davej at redhat.com>
+- Fix bug with MAP_FIXED (#242612).
+
+* Wed Jun 06 2007 Dave Jones <davej at redhat.com>
 - Build with -Wpointer-arith for a while.
   See http://bugzilla.kernel.org/show_bug.cgi?id=7561 for info.
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- linux-2.6-execshield.patch	28 May 2007 06:53:39 -0000	1.55
+++ linux-2.6-execshield.patch	6 Jun 2007 21:55:41 -0000	1.56
@@ -1695,3 +1695,21 @@
  			ret = new_addr;
  			if (new_addr & ~PAGE_MASK)
  				goto out;
+--- linux-2.6.21.noarch/mm/mmap.c~	2007-06-06 17:50:39.000000000 -0400
++++ linux-2.6.21.noarch/mm/mmap.c	2007-06-06 17:52:12.000000000 -0400
+@@ -1422,10 +1422,12 @@ unsigned long arch_get_unmapped_exec_are
+ 	if (len > TASK_SIZE)
+ 		return -ENOMEM;
+ 
+-	if (!addr && !(flags & MAP_FIXED))
+-		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
++	if (flags & MAP_FIXED)
++		return addr;
+ 
+-	if (addr) {
++	if (!addr) {
++		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
++	} else {
+ 		addr = PAGE_ALIGN(addr);
+ 		vma = find_vma(mm, addr);
+ 		if (TASK_SIZE - len >= addr &&