9 |
arch/mips/kernel/ptrace32.c | 9 +++ |
arch/mips/kernel/ptrace32.c | 9 +++ |
10 |
arch/powerpc/kernel/ptrace32.c | 9 +++ |
arch/powerpc/kernel/ptrace32.c | 9 +++ |
11 |
arch/s390/kernel/ptrace.c | 9 +++ |
arch/s390/kernel/ptrace.c | 9 +++ |
|
arch/sh64/kernel/ptrace.c | 9 +++ |
|
12 |
arch/sparc/kernel/ptrace.c | 11 +++ |
arch/sparc/kernel/ptrace.c | 11 +++ |
13 |
arch/sparc64/kernel/ptrace.c | 11 +++ |
arch/sparc64/kernel/ptrace.c | 11 +++ |
14 |
arch/x86_64/ia32/ptrace32.c | 9 +++ |
arch/x86_64/ia32/ptrace32.c | 9 +++ |
44 |
net/ipv6/udp.c | 11 +++ |
net/ipv6/udp.c | 11 +++ |
45 |
net/socket.c | 43 +++++++++++++- |
net/socket.c | 43 +++++++++++++- |
46 |
net/unix/af_unix.c | 15 +++++ |
net/unix/af_unix.c | 15 +++++ |
47 |
43 files changed, 712 insertions(+), 10 deletions(-) |
42 files changed, 703 insertions(+), 10 deletions(-) |
48 |
|
|
49 |
--- linux-2.6.16-76.39vl4.orig/arch/alpha/kernel/ptrace.c |
--- linux-2.6.16-76.39vl4.orig/arch/alpha/kernel/ptrace.c |
50 |
+++ linux-2.6.16-76.39vl4/arch/alpha/kernel/ptrace.c |
+++ linux-2.6.16-76.39vl4/arch/alpha/kernel/ptrace.c |
221 |
lock_kernel(); |
lock_kernel(); |
222 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
223 |
ret = ptrace_traceme(); |
ret = ptrace_traceme(); |
|
--- linux-2.6.16-76.39vl4.orig/arch/sh64/kernel/ptrace.c |
|
|
+++ linux-2.6.16-76.39vl4/arch/sh64/kernel/ptrace.c |
|
|
@@ -36,6 +36,9 @@ |
|
|
#include <asm/system.h> |
|
|
#include <asm/processor.h> |
|
|
#include <asm/mmu_context.h> |
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
|
|
|
|
/* This mask defines the bits of the SR which the user is not allowed to |
|
|
change, which are everything except S, Q, M, PR, SZ, FR. */ |
|
|
@@ -272,6 +275,12 @@ asmlinkage int sh64_ptrace(long request, |
|
|
extern void poke_real_address_q(unsigned long long addr, unsigned long long data); |
|
|
#define WPC_DBRMODE 0x0d104008 |
|
|
static int first_call = 1; |
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+#ifdef TOMOYO_SYS_PTRACE |
|
|
+ if (!ccs_capable(TOMOYO_SYS_PTRACE)) |
|
|
+ return -EPERM; |
|
|
+#endif |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
|
|
|
lock_kernel(); |
|
|
if (first_call) { |
|
224 |
--- linux-2.6.16-76.39vl4.orig/arch/sparc/kernel/ptrace.c |
--- linux-2.6.16-76.39vl4.orig/arch/sparc/kernel/ptrace.c |
225 |
+++ linux-2.6.16-76.39vl4/arch/sparc/kernel/ptrace.c |
+++ linux-2.6.16-76.39vl4/arch/sparc/kernel/ptrace.c |
226 |
@@ -23,6 +23,9 @@ |
@@ -23,6 +23,9 @@ |
926 |
#endif |
#endif |
927 |
+ /***** CCS start. *****/ |
+ /***** CCS start. *****/ |
928 |
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO) |
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO) |
929 |
+ printk(KERN_INFO "Hook version: 2.6.16-76.39vl4 2008/08/29\n"); |
+ printk(KERN_INFO "Hook version: 2.6.16-76.39vl4 2008/10/30\n"); |
930 |
+#endif |
+#endif |
931 |
+ /***** CCS end. *****/ |
+ /***** CCS end. *****/ |
932 |
} |
} |