rpms/kernel/FC-6 linux-2.6-execshield.patch,1.39,1.40
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Oct 28 01:17:09 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7483
Modified Files:
linux-2.6-execshield.patch
Log Message:
put back fixed version of e-s change
linux-2.6-execshield.patch:
2/arch/i386/kernel/sysenter.c | 2
2/mm/mmap.c | 2
linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c | 8
linux-2.6.18.noarch/kernel/sysctl.c | 9 -
linux-810/arch/i386/kernel/cpu/common.c | 7
linux-810/arch/i386/kernel/process.c | 59 ++++++
linux-810/arch/i386/kernel/smp.c | 3
linux-810/arch/i386/kernel/sysenter.c | 3
linux-810/arch/i386/kernel/traps.c | 93 ++++++++++
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/powerpc/kernel/vdso.c | 3
linux-810/arch/x86_64/ia32/ia32_binfmt.c | 6
linux-810/arch/x86_64/ia32/syscall32.c | 4
linux-810/arch/x86_64/kernel/process.c | 6
linux-810/arch/x86_64/kernel/setup64.c | 23 --
linux-810/arch/x86_64/mm/fault.c | 2
linux-810/arch/x86_64/mm/mmap.c | 98 ++++++++---
linux-810/drivers/char/random.c | 7
linux-810/fs/binfmt_elf.c | 147 ++++++++++++----
linux-810/fs/proc/array.c | 8
linux-810/fs/proc/base.c | 8
linux-810/fs/proc/task_mmu.c | 29 ++-
linux-810/include/asm-i386/a.out.h | 2
linux-810/include/asm-i386/desc.h | 14 +
linux-810/include/asm-i386/elf.h | 6
linux-810/include/asm-i386/mmu.h | 4
linux-810/include/asm-i386/page.h | 5
linux-810/include/asm-i386/pgalloc.h | 1
linux-810/include/asm-i386/processor.h | 8
linux-810/include/asm-ia64/pgalloc.h | 4
linux-810/include/asm-powerpc/elf.h | 3
linux-810/include/asm-powerpc/pgalloc.h | 5
linux-810/include/asm-ppc/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/asm-x86_64/pgtable.h | 2
linux-810/include/linux/mm.h | 16 +
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 | 33 +++
linux-810/kernel/sysctl.c | 57 ++++++
linux-810/mm/fremap.c | 16 +
linux-810/mm/mmap.c | 183 ++++++++++++++++++++-
linux-810/mm/mprotect.c | 5
linux-810/mm/mremap.c | 4
50 files changed, 809 insertions(+), 141 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-execshield.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- linux-2.6-execshield.patch 25 Oct 2006 13:21:43 -0000 1.39
+++ linux-2.6-execshield.patch 28 Oct 2006 01:17:05 -0000 1.40
@@ -1904,3 +1904,29 @@
ret = addr;
goto up_fail;
+
+--- linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c.org 2006-05-04 09:23:56.000000000 +0200
++++ linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c 2006-05-04 09:27:21.000000000 +0200
+@@ -9,6 +9,8 @@
+ #include <linux/highmem.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
++#include <linux/kernel.h>
++#include <asm/sections.h>
+ #include <asm/uaccess.h>
+ #include <asm/processor.h>
+ #include <asm/tlbflush.h>
+@@ -130,6 +132,12 @@
+ BUG_ON(PageHighMem(page));
+ address = (unsigned long)page_address(page);
+
++ if (address >= (unsigned long)__start_rodata && address <= (unsigned long)__end_rodata &&
++ (pgprot_val(prot) & _PAGE_RW)) {
++ pgprot_val(prot) &= ~(_PAGE_RW);
++ add_taint(TAINT_MACHINE_CHECK);
++ }
++
+ kpte = lookup_address(address);
+ if (!kpte)
+ return -EINVAL;
+
More information about the fedora-cvs-commits
mailing list