rpms/kernel/FC-6 kernel-2.6.spec, 1.2973, 1.2974 linux-2.6-execshield.patch, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv29076

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/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2973
retrieving revision 1.2974
diff -u -r1.2973 -r1.2974
--- kernel-2.6.spec	10 Jul 2007 21:34:55 -0000	1.2973
+++ kernel-2.6.spec	11 Jul 2007 04:02:47 -0000	1.2974
@@ -2078,6 +2078,9 @@
 %endif
 
 %changelog
+* Tue Jul 10 2007 Dave Jones <davej at redhat.com>
+- Fix issue with PIE randomization (#246623).
+
 * Tue Jul 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - sky2: re-enable lost interrupt workarounds
 - aacraid: ioctl handler needs permission check

linux-2.6-execshield.patch:
 linux-2.6.19.noarch/drivers/char/random.c         |    8 +
 linux-2.6.19.noarch/include/asm-i386/desc.h       |   14 ++
 linux-2.6.20.noarch/arch/i386/kernel/smp.c        |    3 
 linux-2.6.21.noarch/arch/i386/kernel/process.c    |   60 ++++++++++
 linux-2.6.21.noarch/fs/binfmt_elf.c               |  129 +++++++++++++++++-----
 linux-2.6.21.noarch/fs/proc/array.c               |    8 +
 linux-2.6.21.noarch/include/asm-i386/elf.h        |    3 
 linux-2.6.21.noarch/include/asm-powerpc/pgalloc.h |    5 
 linux-2.6.21.noarch/include/asm-sparc64/pgalloc.h |    4 
 linux-2.6.21.noarch/include/linux/mm.h            |    8 +
 linux-2.6.21.noarch/include/linux/sched.h         |   10 +
 linux-2.6.21.noarch/kernel/sysctl.c               |   36 ++++++
 linux-2.6.21.noarch/mm/mmap.c                     |    8 -
 linux-2.6/arch/i386/kernel/cpu/common.c           |    7 +
 linux-2.6/arch/i386/kernel/sysenter.c             |    3 
 linux-2.6/arch/i386/kernel/traps.c                |   99 ++++++++++++++++
 linux-2.6/arch/i386/mm/init.c                     |    7 +
 linux-2.6/arch/i386/mm/mmap.c                     |    6 -
 linux-2.6/arch/i386/mm/pageattr.c                 |    9 +
 linux-2.6/arch/ia64/ia32/binfmt_elf32.c           |    2 
 linux-2.6/arch/x86_64/ia32/ia32_binfmt.c          |    4 
 linux-2.6/arch/x86_64/kernel/process.c            |    6 -
 linux-2.6/arch/x86_64/kernel/setup64.c            |   40 ------
 linux-2.6/arch/x86_64/mm/fault.c                  |    2 
 linux-2.6/arch/x86_64/mm/mmap.c                   |   97 +++++++++++++---
 linux-2.6/fs/proc/base.c                          |    8 -
 linux-2.6/fs/proc/task_mmu.c                      |   29 ++++
 linux-2.6/include/asm-i386/a.out.h                |    2 
 linux-2.6/include/asm-i386/mmu.h                  |    4 
 linux-2.6/include/asm-i386/processor.h            |    8 +
 linux-2.6/include/asm-ia64/pgalloc.h              |    4 
 linux-2.6/include/asm-ppc/pgalloc.h               |    5 
 linux-2.6/include/asm-s390/pgalloc.h              |    4 
 linux-2.6/include/asm-sparc/pgalloc.h             |    4 
 linux-2.6/include/asm-x86_64/pgalloc.h            |    7 +
 linux-2.6/include/linux/resource.h                |    5 
 linux-2.6/include/linux/sysctl.h                  |    2 
 linux-2.6/kernel/signal.c                         |   33 +++++
 linux-2.6/mm/mmap.c                               |  107 ++++++++++++++++--
 linux-2.6/mm/mprotect.c                           |    6 -
 linux-2.6/mm/mremap.c                             |    4 
 41 files changed, 677 insertions(+), 133 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-execshield.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-execshield.patch	10 Jul 2007 01:23:51 -0000	1.45
+++ linux-2.6-execshield.patch	11 Jul 2007 04:02:50 -0000	1.46
@@ -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;