4 |
--- |
--- |
5 |
Makefile | 2 |
Makefile | 2 |
6 |
arch/alpha/kernel/ptrace.c | 8 +++ |
arch/alpha/kernel/ptrace.c | 8 +++ |
7 |
|
arch/ia64/ia32/sys_ia32.c | 8 +++ |
8 |
arch/ia64/kernel/ptrace.c | 8 +++ |
arch/ia64/kernel/ptrace.c | 8 +++ |
9 |
arch/m32r/kernel/ptrace.c | 8 +++ |
arch/m32r/kernel/ptrace.c | 8 +++ |
10 |
|
arch/mips/kernel/ptrace32.c | 8 +++ |
11 |
arch/powerpc/kernel/ptrace32.c | 8 +++ |
arch/powerpc/kernel/ptrace32.c | 8 +++ |
12 |
arch/s390/kernel/ptrace.c | 8 +++ |
arch/s390/kernel/ptrace.c | 8 +++ |
13 |
arch/sh64/kernel/ptrace.c | 8 +++ |
arch/sh64/kernel/ptrace.c | 8 +++ |
46 |
net/ipv6/udp.c | 9 +++ |
net/ipv6/udp.c | 9 +++ |
47 |
net/socket.c | 29 +++++++++++- |
net/socket.c | 29 +++++++++++- |
48 |
net/unix/af_unix.c | 10 ++++ |
net/unix/af_unix.c | 10 ++++ |
49 |
42 files changed, 531 insertions(+), 9 deletions(-) |
44 files changed, 547 insertions(+), 9 deletions(-) |
50 |
|
|
51 |
--- linux-2.6.18.orig/Makefile |
--- linux-2.6.18.orig/Makefile |
52 |
+++ linux-2.6.18/Makefile |
+++ linux-2.6.18/Makefile |
1534 |
|
|
1535 |
switch (request) { |
switch (request) { |
1536 |
case PTRACE_TRACEME: |
case PTRACE_TRACEME: |
1537 |
|
--- linux-2.6.18.orig/arch/ia64/ia32/sys_ia32.c |
1538 |
|
+++ linux-2.6.18/arch/ia64/ia32/sys_ia32.c |
1539 |
|
@@ -56,6 +56,9 @@ |
1540 |
|
#include <asm/types.h> |
1541 |
|
#include <asm/uaccess.h> |
1542 |
|
#include <asm/unistd.h> |
1543 |
|
+/***** TOMOYO Linux start. *****/ |
1544 |
|
+#include <linux/tomoyo.h> |
1545 |
|
+/***** TOMOYO Linux end. *****/ |
1546 |
|
|
1547 |
|
#include "ia32priv.h" |
1548 |
|
|
1549 |
|
@@ -1741,6 +1744,11 @@ sys32_ptrace (int request, pid_t pid, un |
1550 |
|
struct task_struct *child; |
1551 |
|
unsigned int value, tmp; |
1552 |
|
long i, ret; |
1553 |
|
+ /***** TOMOYO Linux start. *****/ |
1554 |
|
+#ifdef TOMOYO_SYS_PTRACE |
1555 |
|
+ if (CheckCapabilityACL(TOMOYO_SYS_PTRACE)) return -EPERM; |
1556 |
|
+#endif |
1557 |
|
+ /***** TOMOYO Linux end. *****/ |
1558 |
|
|
1559 |
|
lock_kernel(); |
1560 |
|
if (request == PTRACE_TRACEME) { |
1561 |
|
--- linux-2.6.18.orig/arch/mips/kernel/ptrace32.c |
1562 |
|
+++ linux-2.6.18/arch/mips/kernel/ptrace32.c |
1563 |
|
@@ -35,6 +35,9 @@ |
1564 |
|
#include <asm/system.h> |
1565 |
|
#include <asm/uaccess.h> |
1566 |
|
#include <asm/bootinfo.h> |
1567 |
|
+/***** TOMOYO Linux start. *****/ |
1568 |
|
+#include <linux/tomoyo.h> |
1569 |
|
+/***** TOMOYO Linux end. *****/ |
1570 |
|
|
1571 |
|
int ptrace_getregs (struct task_struct *child, __s64 __user *data); |
1572 |
|
int ptrace_setregs (struct task_struct *child, __s64 __user *data); |
1573 |
|
@@ -50,6 +53,11 @@ asmlinkage int sys32_ptrace(int request, |
1574 |
|
{ |
1575 |
|
struct task_struct *child; |
1576 |
|
int ret; |
1577 |
|
+ /***** TOMOYO Linux start. *****/ |
1578 |
|
+#ifdef TOMOYO_SYS_PTRACE |
1579 |
|
+ if (CheckCapabilityACL(TOMOYO_SYS_PTRACE)) return -EPERM; |
1580 |
|
+#endif |
1581 |
|
+ /***** TOMOYO Linux end. *****/ |
1582 |
|
|
1583 |
|
#if 0 |
1584 |
|
printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", |