rpms/kernel/F-11 kernel.spec, 1.1782, 1.1783 linux-2.6-execshield.patch, 1.106, 1.107

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16484

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/F-11/kernel.spec,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -p -r1.1782 -r1.1783
--- kernel.spec	4 Dec 2009 06:44:03 -0000	1.1782
+++ kernel.spec	9 Dec 2009 01:28:18 -0000	1.1783
@@ -2168,6 +2168,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.10-104
+- Copy fix for #540580 from F-12.
+
 * Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-103
 - 2.6.30.10
 - nuke ipv4-fix-null-ptr-deref-in-ip_fragment.patch, it's in the latest

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  |    9 ++
 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     |   49 ++++++++++++++
 arch/x86/kernel/traps.c          |  129 ++++++++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c               |    4 +
 arch/x86/mm/init_32.c            |   16 ++--
 arch/x86/mm/mmap.c               |    5 +
 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 -
 23 files changed, 464 insertions(+), 37 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-execshield.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- linux-2.6-execshield.patch	25 Jul 2009 04:09:24 -0000	1.106
+++ linux-2.6-execshield.patch	9 Dec 2009 01:28:18 -0000	1.107
@@ -384,7 +384,7 @@ index a1d2883..453b616 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