r2451 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Frederik Schüler
fschueler-guest@costa.debian.org
Mon, 07 Feb 2005 12:08:20 +0100
Author: fschueler-guest
Date: 2005-02-07 12:08:19 +0100 (Mon, 07 Feb 2005)
New Revision: 2451
Added:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-int3-fix.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-parse-noexec-fix.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
Log:
Added noexec command line fix backport and reverted int3 handling for amd64.
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-02-07 10:15:43 UTC (rev 2450)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-02-07 11:08:19 UTC (rev 2451)
@@ -15,10 +15,15 @@
fix crash in 32bit emulation. Backport from 2.6.11-rc2 (Frederik Schüler)
* [powerpc] - powerpc-fix-power3-ftbfs.dpatch
- Fix a FTBFS with the simple bootloaders on power3/4.
+ Fix a FTBFS with the simple bootloaders on power3/4. (Sven Luther)
- -- Sven Luther <luther@debian.org> Mon, 7 Feb 2005 07:47:11 +0100
+ * amd64-parse-noexec-fix.dpatch
+ Backport fix for noexec boot option parsing.
+ amd64-int3-fix.dpatch
+ Revert int3 handling. (Frederik Schüler)
+ -- Frederik Schüler <fschueler@gmx.net> Mon, 7 Feb 2005 11:45:55 +0100
+
kernel-source-2.6.10 (2.6.10-4) unstable; urgency=low
* Replace smbfs-overflow-fixes.patch with a newer version from 2.6.10-ac
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-int3-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-int3-fix.dpatch 2005-02-07 10:15:43 UTC (rev 2450)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-int3-fix.dpatch 2005-02-07 11:08:19 UTC (rev 2451)
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+## amd64-int3-fix.dpatch by <fschueler@gmx.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Revert int3 handling
+## DP: Patch author: Andi Kleen <ak@muc.de>
+## DP: Upstream status: not yet committed to BK
+
+. $(dirname $0)/DPATCH
+
+@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 @@
+ struct die_args *args = (struct die_args *)data;
+ switch (val) {
+ case DIE_INT3:
++ if (args->regs->cs & 3)
++ return NOTIFY_DONE;
+ if (kprobe_handler(args->regs))
+ return NOTIFY_STOP;
+ break;
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-parse-noexec-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-parse-noexec-fix.dpatch 2005-02-07 10:15:43 UTC (rev 2450)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-parse-noexec-fix.dpatch 2005-02-07 11:08:19 UTC (rev 2451)
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## amd64-parse-noexec-fix.dpatch by <fschueler@gmx.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fix parsing of noexec boot option
+## DP: Patch author: fabbione@fabbione.net
+## DP: Upstream status: backport from BK current
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/05 15:10:06-08:00 fabbione@fabbione.net
+# [PATCH] x86_64: parse noexec=[on|off]
+#
+# The patch fixes the noexec= boot option on x86_64 to actually work when
+# other options come after it.
+#
+# Credits (if any ;)) should go to Matt Zimmerman and Colin Watson for
+# spotting the problem and providing/testing the fix.
+#
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# arch/x86_64/kernel/setup64.c
+# 2005/02/05 12:54:22-08:00 fabbione@fabbione.net +2 -2
+# x86_64: parse noexec=[on|off]
+#
+diff -Nru a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
+--- a/arch/x86_64/kernel/setup64.c 2005-02-06 05:52:25 -08:00
++++ b/arch/x86_64/kernel/setup64.c 2005-02-06 05:52:25 -08:00
+@@ -52,10 +52,10 @@
+ */
+ void __init nonx_setup(const char *str)
+ {
+- if (!strcmp(str, "on")) {
++ if (!strncmp(str, "on", 2)) {
+ __supported_pte_mask |= _PAGE_NX;
+ do_not_nx = 0;
+- } else if (!strcmp(str, "off")) {
++ } else if (!strncmp(str, "off", 3)) {
+ do_not_nx = 1;
+ __supported_pte_mask &= ~_PAGE_NX;
+ }
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5 2005-02-07 10:15:43 UTC (rev 2450)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5 2005-02-07 11:08:19 UTC (rev 2451)
@@ -3,3 +3,5 @@
+ ia64-unwind-fix.dpatch
+ amd64-ia32-vsyscall-fix.dpatch
+ powerpc-fix-power3-ftbfs.dpatch
++ amd64-parse-noexec-fix.dpatch
++ amd64-int3-fix.dpatch