rpms/kernel/devel kernel.spec, 1.1868, 1.1869 linux-2.6-execshield.patch, 1.111, 1.112

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17899

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
Copy fix for #540580 from F-12.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -p -r1.1868 -r1.1869
--- kernel.spec	8 Dec 2009 20:55:06 -0000	1.1868
+++ kernel.spec	9 Dec 2009 01:32:09 -0000	1.1869
@@ -1997,6 +1997,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-6
+- Copy fix for #540580 from F-12.
+
 * Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-5
 - new rpm changes:
  - %{PACKAGE_VERSION} -> %{version}

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    4 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 463 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- linux-2.6-execshield.patch	28 Sep 2009 22:57:23 -0000	1.111
+++ linux-2.6-execshield.patch	9 Dec 2009 01:32:09 -0000	1.112
@@ -385,7 +385,7 @@ index 7e37dce..92ae538 100644
 +			info.si_errno = 0;
 +			info.si_code = ILL_BADSTK;
 +			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++			do_trap(32, SIGSEGV, "iret exception", regs, error_code, &info);
 +	}
  }
  #endif