Re: [uml-devel] [RFC PATCH] SKAS3 for 2.6.24-rc7 (2nd try)

[Ryan Finnie <ryan@finnie.org>]

[-- Attachment #1.1.1: Type: text/plain, Size: 872 bytes --]

Oh, and it appears that with a little glue (attached), the SKAS3 and
SKAS4 patches can co-exist.  I currently have a host running with both
SKAS3 and SKAS4 guests running on it.  And if you apply SKAS3, SKAS4 and
the glue to a guest, it should be able to run on SKAS3 or SKAS4 hosts
(with SKAS4 being preferred if the host has both SKAS3 and SKAS4).

Repeating Jeff's warning about SKAS4: "This is very experimental at this
point.  Don't let it near anything resembling a production system."
(Though SKAS4 has been working quite well for me in testing.)

RF

 arch/x86/ia32/ptrace32.c     |    4 ++--
 arch/x86/kernel/ptrace_32.c  |    2 +-
 arch/x86/kernel/ptrace_64.c  |    2 +-
 include/asm-x86/ptrace-abi.h |    2 +-
 include/asm-x86/ptrace.h     |    2 +-
 mm/proc_mm.c                 |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 2.6.24-rc7-skas3-skas4-glue.patch --]
[-- Type: text/x-patch; name="2.6.24-rc7-skas3-skas4-glue.patch", Size: 3265 bytes --]

diff -ruN linux-2.6.24-rc7.a/arch/x86/ia32/ptrace32.c linux-2.6.24-rc7.b/arch/x86/ia32/ptrace32.c
--- linux-2.6.24-rc7.a/arch/x86/ia32/ptrace32.c	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/arch/x86/ia32/ptrace32.c	2008-01-13 04:06:23.000000000 -0800
@@ -273,7 +273,7 @@
 	case PTRACE_EX_FAULTINFO:
 	case PTRACE_FAULTINFO:
 	case PTRACE_LDT:
-	case PTRACE_SWITCH_MM:
+	case OLD_PTRACE_SWITCH_MM:
 #endif
 		break;
 
@@ -433,7 +433,7 @@
 		break;
 	}
 
-	case PTRACE_SWITCH_MM: {
+	case OLD_PTRACE_SWITCH_MM: {
 		struct mm_struct *old = child->mm;
 		struct mm_struct *new = proc_mm_get_mm(data);
 
diff -ruN linux-2.6.24-rc7.a/arch/x86/kernel/ptrace_32.c linux-2.6.24-rc7.b/arch/x86/kernel/ptrace_32.c
--- linux-2.6.24-rc7.a/arch/x86/kernel/ptrace_32.c	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/arch/x86/kernel/ptrace_32.c	2008-01-13 04:06:23.000000000 -0800
@@ -647,7 +647,7 @@
 		break;
 	}
 
-	case PTRACE_SWITCH_MM: {
+	case OLD_PTRACE_SWITCH_MM: {
 		struct mm_struct *old = child->mm;
 		struct mm_struct *new = proc_mm_get_mm(data);
 
diff -ruN linux-2.6.24-rc7.a/arch/x86/kernel/ptrace_64.c linux-2.6.24-rc7.b/arch/x86/kernel/ptrace_64.c
--- linux-2.6.24-rc7.a/arch/x86/kernel/ptrace_64.c	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/arch/x86/kernel/ptrace_64.c	2008-01-13 04:06:23.000000000 -0800
@@ -601,7 +601,7 @@
 		break;
 	}
 
-	case PTRACE_SWITCH_MM: {
+	case OLD_PTRACE_SWITCH_MM: {
 		struct mm_struct *old = child->mm;
 		struct mm_struct *new = proc_mm_get_mm64(data);
 
diff -ruN linux-2.6.24-rc7.a/include/asm-x86/ptrace-abi.h linux-2.6.24-rc7.b/include/asm-x86/ptrace-abi.h
--- linux-2.6.24-rc7.a/include/asm-x86/ptrace-abi.h	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/include/asm-x86/ptrace-abi.h	2008-01-13 04:06:23.000000000 -0800
@@ -68,7 +68,7 @@
 #define PTRACE_FAULTINFO 52
 /* 53 was used for PTRACE_SIGPENDING, don't reuse it. */
 #define PTRACE_LDT 54
-#define PTRACE_SWITCH_MM 55
+#define OLD_PTRACE_SWITCH_MM 55
 #define PTRACE_EX_FAULTINFO	  56
 
 #define PTRACE_OLDSETOPTIONS      21
diff -ruN linux-2.6.24-rc7.a/include/asm-x86/ptrace.h linux-2.6.24-rc7.b/include/asm-x86/ptrace.h
--- linux-2.6.24-rc7.a/include/asm-x86/ptrace.h	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/include/asm-x86/ptrace.h	2008-01-13 04:06:23.000000000 -0800
@@ -146,7 +146,7 @@
 #define PTRACE_FAULTINFO	  52
 /* 53 was used for PTRACE_SIGPENDING, don't reuse it. */
 #define PTRACE_LDT		  54
-#define PTRACE_SWITCH_MM 	  55
+#define OLD_PTRACE_SWITCH_MM 	  55
 #define PTRACE_EX_FAULTINFO	  56
 
 struct ptrace_faultinfo {
diff -ruN linux-2.6.24-rc7.a/mm/proc_mm.c linux-2.6.24-rc7.b/mm/proc_mm.c
--- linux-2.6.24-rc7.a/mm/proc_mm.c	2008-01-13 04:07:30.000000000 -0800
+++ linux-2.6.24-rc7.b/mm/proc_mm.c	2008-01-13 04:06:23.000000000 -0800
@@ -32,7 +32,7 @@
 }
 
 /*
- * This is to be used in PTRACE_SWITCH_MM handling. We are going to set
+ * This is to be used in OLD_PTRACE_SWITCH_MM handling. We are going to set
  * child->mm to new, and we must first correctly set new->dumpable.
  * Since we take task_lock of child and it's needed also by the caller, we
  * return with it locked.

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

[-- Attachment #2: Type: text/plain, Size: 278 bytes --]

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace

[-- Attachment #3: Type: text/plain, Size: 194 bytes --]

_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel