rpms/kernel/FC-4 kernel-2.6.spec, 1.1360, 1.1361 linux-2.6.11-execshield.patch, 1.8, 1.9
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 25 23:18:18 UTC 2005
Author: davej
Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11154
Modified Files:
kernel-2.6.spec linux-2.6.11-execshield.patch
Log Message:
vdso fix from devel/
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1360
retrieving revision 1.1361
diff -u -r1.1360 -r1.1361
--- kernel-2.6.spec 25 May 2005 21:34:39 -0000 1.1360
+++ kernel-2.6.spec 25 May 2005 23:18:16 -0000 1.1361
@@ -1272,6 +1272,7 @@
This is causing "can't boot" problems for quite a few folks.
We'll fix this and reenable it in an update. If it was working
fine for you before this kernel, you can boot with vdso=1
+- Tweak to fix up some vdso arithmetic.
* Wed May 25 2005 David Woodhouse <dwmw2 at redhat.com>
- Turn off CONFIG_ISA on PPC again. It makes some Macs unhappy (#149200)
linux-2.6.11-execshield.patch:
linux-2.6.11/arch/i386/kernel/traps.c | 111 ++++++++++++++++-------
linux-2.6.11/arch/x86_64/mm/fault.c | 4
linux-2.6.11/include/asm-x86_64/processor.h | 8 +
linux-810/arch/i386/kernel/asm-offsets.c | 1
linux-810/arch/i386/kernel/entry.S | 8 +
linux-810/arch/i386/kernel/process.c | 59 ++++++++++++
linux-810/arch/i386/kernel/signal.c | 4
linux-810/arch/i386/kernel/smp.c | 3
linux-810/arch/i386/kernel/sysenter.c | 55 +++++++++++
linux-810/arch/i386/kernel/traps.c | 48 +++++++++-
linux-810/arch/i386/kernel/vsyscall-sysenter.S | 6 -
linux-810/arch/i386/kernel/vsyscall.lds.S | 4
linux-810/arch/i386/mm/init.c | 6 +
linux-810/arch/i386/mm/mmap.c | 6 -
linux-810/arch/ia64/ia32/binfmt_elf32.c | 2
linux-810/arch/x86_64/ia32/ia32_binfmt.c | 2
linux-810/arch/x86_64/kernel/process.c | 7 -
linux-810/arch/x86_64/mm/Makefile | 2
linux-810/arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++
linux-810/drivers/char/random.c | 7 +
linux-810/fs/binfmt_elf.c | 120 ++++++++++++++++++++-----
linux-810/fs/proc/array.c | 8 +
linux-810/fs/proc/base.c | 4
linux-810/fs/proc/task_mmu.c | 25 ++++-
linux-810/include/asm-i386/desc.h | 14 ++
linux-810/include/asm-i386/elf.h | 42 +++++---
linux-810/include/asm-i386/mmu.h | 6 +
linux-810/include/asm-i386/pgalloc.h | 1
linux-810/include/asm-i386/processor.h | 8 +
linux-810/include/asm-i386/thread_info.h | 1
linux-810/include/asm-ia64/pgalloc.h | 4
linux-810/include/asm-ppc/pgalloc.h | 5 +
linux-810/include/asm-ppc64/pgalloc.h | 5 +
linux-810/include/asm-s390/pgalloc.h | 4
linux-810/include/asm-sparc/pgalloc.h | 4
linux-810/include/asm-sparc64/pgalloc.h | 4
linux-810/include/asm-x86_64/pgalloc.h | 7 +
linux-810/include/linux/mm.h | 9 +
linux-810/include/linux/resource.h | 5 -
linux-810/include/linux/sched.h | 9 +
linux-810/include/linux/sysctl.h | 3
linux-810/kernel/signal.c | 38 +++++++
linux-810/kernel/sysctl.c | 39 ++++++++
linux-810/mm/fremap.c | 10 +-
linux-810/mm/mmap.c | 105 ++++++++++++++++++++-
linux-810/mm/mprotect.c | 5 -
linux-810/mm/mremap.c | 4
47 files changed, 803 insertions(+), 124 deletions(-)
Index: linux-2.6.11-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6.11-execshield.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6.11-execshield.patch 20 May 2005 20:36:32 -0000 1.8
+++ linux-2.6.11-execshield.patch 25 May 2005 23:18:16 -0000 1.9
@@ -21,9 +21,9 @@
+ /*
+ * Push current_thread_info()->sysenter_return to the stack.
+ * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
-+ * pushed above, and the word being pushed now:
++ * pushed above; +8 corresponds to copy_thread's esp0 setting.
+ */
-+ pushl (TI_sysenter_return-THREAD_SIZE+4*4)(%esp)
++ pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
/*
* Load the potential sixth argument from user stack.
* Careful about security.
More information about the fedora-cvs-commits
mailing list