rpms/kernel/F-7 kernel-2.6.spec, 1.3264, 1.3265 linux-2.6-execshield.patch, 1.54, 1.55

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
Log Message:
* Tue Jul 10 2007 Dave Jones <davej at redhat.com>
- Fix issue with PIE randomization (#246623).



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3264
retrieving revision 1.3265
diff -u -r1.3264 -r1.3265
--- kernel-2.6.spec	10 Jul 2007 21:39:42 -0000	1.3264
+++ kernel-2.6.spec	11 Jul 2007 03:55:59 -0000	1.3265
@@ -2076,4 +2076,7 @@
 
 %changelog
 * Tue Jul 10 2007 Dave Jones <davej at redhat.com>
+- Fix issue with PIE randomization (#246623).
+
+* Tue Jul 10 2007 Dave Jones <davej at redhat.com>
 - Rebase to 2.6.22

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-execshield.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- linux-2.6-execshield.patch	10 Jul 2007 16:14:59 -0000	1.54
+++ linux-2.6-execshield.patch	11 Jul 2007 03:55:59 -0000	1.55
@@ -864,15 +864,6 @@
  
  /*
   * If we don't support core dumping, then supply a NULL so we
-@@ -83,7 +83,7 @@ static struct linux_binfmt elf_format = 
- 		.min_coredump	= ELF_EXEC_PAGESIZE
- };
- 
--#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
-+#define BAD_ADDR(x) ((unsigned long)(x) >= PAGE_MASK)
- 
- static int set_brk(unsigned long start, unsigned long end)
- {
 @@ -285,33 +285,71 @@ create_elf_tables(struct linux_binprm *b
  #ifndef elf_map
  
@@ -1094,7 +1085,7 @@
 -						    &interp_load_addr);
 +						    &interp_map_addr,
 +						    load_bias);
-+			if (!BAD_ADDR(elf_entry)) {
++			if (!IS_ERR((void *)elf_entry)) {
 +				/* load_elf_interp() returns relocation adjustment */
 +				interp_load_addr = elf_entry;
 +				elf_entry += loc->interp_elf_ex.e_entry;