r2612 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series
Sven Luther
luther@costa.debian.org
Sat, 05 Mar 2005 11:01:53 +0100
Author: luther
Date: 2005-03-05 11:01:53 +0100 (Sat, 05 Mar 2005)
New Revision: 2612
Removed:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-noexec32-backport.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-int3-fix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
Two more patches processed, all apart one hunk is upstream
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-05 09:52:00 UTC (rev 2611)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-05 10:01:53 UTC (rev 2612)
@@ -12,6 +12,4 @@
# + 029-random_poolsize_overflow.dpatch # FAILED
# + 030-moxa_user_copy_checking.dpatch # FAILED
# + drivers-ide-__devinit.dpatch # FAILED
-# + amd64-int3-fix.dpatch # PARTIALLY REVERSED, needs investigating.
# + ipv4-fragment-queues-2.dpatch # FAILED
-# + amd64-noexec32-backport.dpatch # FAILED
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-int3-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-int3-fix.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-int3-fix.dpatch 2005-03-05 10:01:53 UTC (rev 2612)
@@ -10,20 +10,9 @@
@DPATCH@
---- kernel-source-2.6.10/arch/x86_64/kernel/traps.orig 2005-02-07 00:15:40.469350403 +0100
-+++ kernel-source-2.6.10/arch/x86_64/kernel/traps.c 2005-02-07 00:16:20.791649921 +0100
-@@ -910,7 +910,7 @@
- set_intr_gate(0,÷_error);
- set_intr_gate_ist(1,&debug,DEBUG_STACK);
- set_intr_gate_ist(2,&nmi,NMI_STACK);
-- set_intr_gate(3,&int3);
-+ set_system_gate(3,&int3);
- set_system_gate(4,&overflow); /* int4-5 can be called from all */
- set_system_gate(5,&bounds);
- set_intr_gate(6,&invalid_op);
---- kernel-source-2.6.10/arch/x86_64/kernel/kprobes.orig 2005-02-07 00:16:27.950460319 +0100
-+++ kernel-source-2.6.10/arch/x86_64/kernel/kprobes.c 2005-02-07 00:20:20.651791614 +0100
-@@ -297,6 +297,8 @@
+--- kernel-source-2.6.11-2.6.11-orig/arch/x86_64/kernel/kprobes.c 2005-03-02 08:38:12.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/arch/x86_64/kernel/kprobes.c 2005-03-05 10:55:17.306986104 +0100
+@@ -307,6 +307,8 @@
struct die_args *args = (struct die_args *)data;
switch (val) {
case DIE_INT3:
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-noexec32-backport.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-noexec32-backport.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/amd64-noexec32-backport.dpatch 2005-03-05 10:01:53 UTC (rev 2612)
@@ -1,91 +0,0 @@
-#! /bin/sh -e
-## amd64-noexec32-backport.dpatch by Frederik Schüler <f.schueler@gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: enable executable stack and executable heap for all 32bit programs on x86-64, except if noexec32=on is specified.
-## DP: Patch author: Andi Kleen <ak@suse.de>
-## DP: Upstream status: backport from 2.6.11-rc4
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- ./arch/x86_64/kernel/process.c.orig 2005-02-23 17:44:38.298266097 +0100
-+++ ./arch/x86_64/kernel/process.c 2005-02-23 17:48:52.229019916 +0100
-@@ -560,6 +560,13 @@
-
- /* Make sure to be in 64bit mode */
- clear_thread_flag(TIF_IA32);
-+
-+ /* TBD: overwrites user setup. Should have two bits.
-+ But 64bit processes have always behaved this way,
-+ so it's not too bad. The main problem is just that
-+ 32bit childs are affected again. */
-+ current->personality &= ~READ_IMPLIES_EXEC;
-+
- }
-
- asmlinkage long sys_fork(struct pt_regs *regs)
---- ./arch/x86_64/kernel/setup64.c.orig 2005-02-23 23:58:30.719543925 +0100
-+++ ./arch/x86_64/kernel/setup64.c 2005-02-23 23:59:20.551256256 +0100
-@@ -59,11 +59,30 @@
- do_not_nx = 1;
- __supported_pte_mask &= ~_PAGE_NX;
- }
-- return 1;
-+ return 0;
- }
-
- __setup("noexec=", nonx_setup);
-
-+int force_personality32 = READ_IMPLIES_EXEC;
-+
-+/* noexec32=on|off
-+ Control non executable heap for 32bit processes.
-+ To control the stack too use noexec=off
-+
-+ on PROT_READ does not imply PROT_EXEC for 32bit processes
-+ off PROT_READ implies PROT_EXEC (default)
-+*/
-+static int __init nonx32_setup(char *str)
-+{
-+ if (!strcmp(str, "on"))
-+ force_personality32 &= ~READ_IMPLIES_EXEC;
-+ else if (!strcmp(str, "off"))
-+ force_personality32 |= READ_IMPLIES_EXEC;
-+ return 0;
-+}
-+__setup("noexec32=", nonx32_setup);
-+
- /*
- * Great future plan:
- * Declare PDA itself and support (irqstack,tss,pml4) as per cpu data.
---- ./arch/x86_64/ia32/ia32_binfmt.c.orig 2005-02-23 17:40:43.650300332 +0100
-+++ ./arch/x86_64/ia32/ia32_binfmt.c 2005-02-23 17:44:20.781180261 +0100
-@@ -249,6 +249,8 @@
- #define elf_check_arch(x) \
- ((x)->e_machine == EM_386)
-
-+extern int force_personality32;
-+
- #define ELF_EXEC_PAGESIZE PAGE_SIZE
- #define ELF_HWCAP (boot_cpu_data.x86_capability[0])
- #define ELF_PLATFORM ("i686")
-@@ -262,6 +264,8 @@
- set_thread_flag(TIF_ABI_PENDING); \
- else \
- clear_thread_flag(TIF_ABI_PENDING); \
-+ /* XXX This overwrites the user set personality */ \
-+ current->personality |= force_personality32; \
- } while (0)
-
- /* Override some function names */
---- ./include/asm-x86_64/pgtable.h.orig 2005-02-23 20:55:49.128396559 +0100
-+++ ./include/asm-x86_64/pgtable.h 2005-02-23 20:56:32.137208282 +0100
-@@ -27,6 +27,7 @@
-
- #define swapper_pg_dir NULL
-
-+extern int nonx_setup(char *str);
- extern void paging_init(void);
- extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
-
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-05 09:52:00 UTC (rev 2611)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-05 10:01:53 UTC (rev 2612)
@@ -40,3 +40,5 @@
+ ia64-irq-affinity-upfix.dpatch
+ tty-locking-fixes9.dpatch
+ sparc64-hme-lockup.dpatch
++ amd64-int3-fix.dpatch
+