rpms/kernel/devel kernel-2.6.spec, 1.1216, 1.1217 linux-2.6.8-execshield-xen.patch, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	kernel-2.6.spec linux-2.6.8-execshield-xen.patch 
Log Message:
apply the xen execshield patch again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -r1.1216 -r1.1217
--- kernel-2.6.spec	30 Mar 2005 16:33:16 -0000	1.1216
+++ kernel-2.6.spec	30 Mar 2005 16:36:32 -0000	1.1217
@@ -252,6 +252,7 @@
 
 Patch810: linux-2.6.11-execshield.patch
 Patch811: linux-2.6.10-x86_64-read-implies-exec32.patch
+Patch812: linux-2.6.8-execshield-xen.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6.7-modsign-core.patch
@@ -569,6 +570,9 @@
 # Revert x86-64 read-implies-exec on 32 bit processes.
 %patch811 -p1 -R
 
+# Xen exec-shield bits
+%patch812 -p1
+
 #
 # GPG signed kernel modules
 #

linux-2.6.8-execshield-xen.patch:
 arch/xen/i386/kernel/cpu/common.c    |    6 +++
 arch/xen/i386/kernel/entry.S         |    2 -
 arch/xen/i386/kernel/process.c       |   65 +++++++++++++++++++++++++++++++++++
 arch/xen/i386/kernel/smp.c           |    3 +
 arch/xen/i386/kernel/traps.c         |   36 +++++++++++++++++++
 arch/xen/i386/mm/init.c              |    3 +
 fs/binfmt_elf.c                      |    1 
 include/asm-i386/elf.h               |    2 +
 include/asm-xen/asm-i386/desc.h      |   10 +++++
 include/asm-xen/asm-i386/pgalloc.h   |    5 ++
 include/asm-xen/asm-i386/processor.h |    4 ++
 kernel/sysctl.c                      |    2 -
 12 files changed, 137 insertions(+), 2 deletions(-)

Index: linux-2.6.8-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.8-execshield-xen.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6.8-execshield-xen.patch	1 Feb 2005 21:56:09 -0000	1.7
+++ linux-2.6.8-execshield-xen.patch	30 Mar 2005 16:36:32 -0000	1.8
@@ -45,7 +45,7 @@
 + */
 +unsigned long arch_align_stack(unsigned long sp)
 +{
-+	if (current->flags & PF_RELOCEXEC)
++	if (randomize_va_space)
 +		sp -= ((get_random_int() % 65536) << 4);
 +	return sp & ~0xf;
 +}