2 |
|
|
3 |
Source code for this patch is "apt-get install linux-source-2.6.15" |
Source code for this patch is "apt-get install linux-source-2.6.15" |
4 |
--- |
--- |
5 |
arch/alpha/kernel/ptrace.c | 7 ++ |
arch/alpha/kernel/ptrace.c | 3 +++ |
6 |
arch/ia64/ia32/sys_ia32.c | 7 ++ |
arch/ia64/ia32/sys_ia32.c | 3 +++ |
7 |
arch/ia64/kernel/ptrace.c | 7 ++ |
arch/ia64/kernel/ptrace.c | 3 +++ |
8 |
arch/m32r/kernel/ptrace.c | 7 ++ |
arch/m32r/kernel/ptrace.c | 3 +++ |
9 |
arch/mips/kernel/ptrace32.c | 7 ++ |
arch/mips/kernel/ptrace32.c | 3 +++ |
10 |
arch/powerpc/kernel/ptrace32.c | 7 ++ |
arch/powerpc/kernel/ptrace32.c | 3 +++ |
11 |
arch/s390/kernel/ptrace.c | 7 ++ |
arch/s390/kernel/ptrace.c | 3 +++ |
12 |
arch/sparc/kernel/ptrace.c | 9 +++ |
arch/sparc/kernel/ptrace.c | 5 +++++ |
13 |
arch/sparc64/kernel/ptrace.c | 9 +++ |
arch/sparc64/kernel/ptrace.c | 5 +++++ |
14 |
arch/x86_64/ia32/ptrace32.c | 7 ++ |
arch/x86_64/ia32/ptrace32.c | 3 +++ |
15 |
fs/Kconfig | 2 |
fs/compat.c | 9 ++++++++- |
16 |
fs/Makefile | 2 |
fs/exec.c | 12 +++++++++++- |
17 |
fs/attr.c | 19 ++++++ |
fs/fcntl.c | 4 ++++ |
18 |
fs/compat.c | 15 +++++ |
fs/ioctl.c | 3 +++ |
19 |
fs/exec.c | 21 +++++++ |
fs/namei.c | 31 +++++++++++++++++++++++++++++++ |
20 |
fs/fcntl.c | 8 ++ |
fs/namespace.c | 9 +++++++++ |
21 |
fs/ioctl.c | 11 +++ |
fs/open.c | 27 ++++++++++++++++++++++++++- |
22 |
fs/namei.c | 60 +++++++++++++++++++++ |
fs/proc/proc_misc.c | 1 + |
23 |
fs/namespace.c | 50 +++++++++++++++++- |
include/linux/init_task.h | 9 +++++++++ |
24 |
fs/open.c | 30 ++++++++++ |
include/linux/sched.h | 6 ++++++ |
25 |
fs/proc/Makefile | 3 + |
kernel/compat.c | 3 +++ |
26 |
fs/proc/proc_misc.c | 5 + |
kernel/kexec.c | 3 +++ |
27 |
include/linux/init_task.h | 4 + |
kernel/kmod.c | 5 +++++ |
28 |
include/linux/sched.h | 8 ++ |
kernel/module.c | 7 +++++-- |
29 |
kernel/compat.c | 7 ++ |
kernel/ptrace.c | 3 +++ |
30 |
kernel/kexec.c | 7 ++ |
kernel/sched.c | 3 +++ |
31 |
kernel/kmod.c | 5 + |
kernel/signal.c | 9 +++++++++ |
32 |
kernel/module.c | 13 +++- |
kernel/sys.c | 11 +++++++++++ |
33 |
kernel/ptrace.c | 7 ++ |
kernel/sysctl.c | 11 +++++++++++ |
34 |
kernel/sched.c | 7 ++ |
kernel/time.c | 7 +++++++ |
35 |
kernel/signal.c | 21 +++++++ |
net/ipv4/inet_connection_sock.c | 3 +++ |
36 |
kernel/sys.c | 21 +++++++ |
net/ipv4/raw.c | 12 +++++++++--- |
37 |
kernel/sysctl.c | 111 ++++++++++++++++++++++++++++++++++++++++ |
net/ipv4/tcp_ipv4.c | 3 +++ |
38 |
kernel/time.c | 15 +++++ |
net/ipv4/udp.c | 16 ++++++++++++++-- |
39 |
net/core/datagram.c | 11 +++ |
net/ipv6/raw.c | 12 +++++++++--- |
40 |
net/ipv4/inet_connection_sock.c | 7 ++ |
net/ipv6/tcp_ipv6.c | 5 +++++ |
41 |
net/ipv4/tcp_ipv4.c | 7 ++ |
net/ipv6/udp.c | 14 +++++++++++++- |
42 |
net/ipv4/udp.c | 11 +++ |
net/socket.c | 23 ++++++++++++++++++++--- |
43 |
net/ipv6/tcp_ipv6.c | 11 +++ |
net/unix/af_unix.c | 9 +++++++++ |
44 |
net/ipv6/udp.c | 11 +++ |
security/Kconfig | 2 ++ |
45 |
net/socket.c | 43 ++++++++++++++- |
security/Makefile | 3 +++ |
46 |
net/unix/af_unix.c | 8 ++ |
41 files changed, 292 insertions(+), 17 deletions(-) |
|
42 files changed, 626 insertions(+), 9 deletions(-) |
|
47 |
|
|
48 |
--- linux-2.6.15-53.75.orig/arch/alpha/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/alpha/kernel/ptrace.c |
49 |
+++ linux-2.6.15-53.75/arch/alpha/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/alpha/kernel/ptrace.c |
50 |
@@ -20,6 +20,9 @@ |
@@ -20,6 +20,7 @@ |
51 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
52 |
#include <asm/system.h> |
#include <asm/system.h> |
53 |
#include <asm/fpu.h> |
#include <asm/fpu.h> |
54 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
55 |
|
|
56 |
#include "proto.h" |
#include "proto.h" |
57 |
|
|
58 |
@@ -261,6 +264,10 @@ do_sys_ptrace(long request, long pid, lo |
@@ -261,6 +262,8 @@ do_sys_ptrace(long request, long pid, lo |
59 |
unsigned long tmp; |
unsigned long tmp; |
60 |
size_t copied; |
size_t copied; |
61 |
long ret; |
long ret; |
62 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
63 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
64 |
|
|
65 |
lock_kernel(); |
lock_kernel(); |
66 |
DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n", |
DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n", |
67 |
--- linux-2.6.15-53.75.orig/arch/ia64/ia32/sys_ia32.c |
--- linux-2.6.15-55.87.orig/arch/ia64/ia32/sys_ia32.c |
68 |
+++ linux-2.6.15-53.75/arch/ia64/ia32/sys_ia32.c |
+++ linux-2.6.15-55.87/arch/ia64/ia32/sys_ia32.c |
69 |
@@ -57,6 +57,9 @@ |
@@ -57,6 +57,7 @@ |
70 |
#include <asm/types.h> |
#include <asm/types.h> |
71 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
72 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
73 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
74 |
|
|
75 |
#include "ia32priv.h" |
#include "ia32priv.h" |
76 |
|
|
77 |
@@ -1758,6 +1761,10 @@ sys32_ptrace (int request, pid_t pid, un |
@@ -1758,6 +1759,8 @@ sys32_ptrace (int request, pid_t pid, un |
78 |
struct task_struct *child; |
struct task_struct *child; |
79 |
unsigned int value, tmp; |
unsigned int value, tmp; |
80 |
long i, ret; |
long i, ret; |
81 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
82 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
83 |
|
|
84 |
lock_kernel(); |
lock_kernel(); |
85 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
86 |
--- linux-2.6.15-53.75.orig/arch/ia64/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/ia64/kernel/ptrace.c |
87 |
+++ linux-2.6.15-53.75/arch/ia64/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/ia64/kernel/ptrace.c |
88 |
@@ -29,6 +29,9 @@ |
@@ -29,6 +29,7 @@ |
89 |
#ifdef CONFIG_PERFMON |
#ifdef CONFIG_PERFMON |
90 |
#include <asm/perfmon.h> |
#include <asm/perfmon.h> |
91 |
#endif |
#endif |
92 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
93 |
|
|
94 |
#include "entry.h" |
#include "entry.h" |
95 |
|
|
96 |
@@ -1418,6 +1421,10 @@ sys_ptrace (long request, pid_t pid, uns |
@@ -1418,6 +1419,8 @@ sys_ptrace (long request, pid_t pid, uns |
97 |
struct task_struct *child; |
struct task_struct *child; |
98 |
struct switch_stack *sw; |
struct switch_stack *sw; |
99 |
long ret; |
long ret; |
100 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
101 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
102 |
|
|
103 |
lock_kernel(); |
lock_kernel(); |
104 |
ret = -EPERM; |
ret = -EPERM; |
105 |
--- linux-2.6.15-53.75.orig/arch/m32r/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/m32r/kernel/ptrace.c |
106 |
+++ linux-2.6.15-53.75/arch/m32r/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/m32r/kernel/ptrace.c |
107 |
@@ -33,6 +33,9 @@ |
@@ -33,6 +33,7 @@ |
108 |
#include <asm/system.h> |
#include <asm/system.h> |
109 |
#include <asm/processor.h> |
#include <asm/processor.h> |
110 |
#include <asm/mmu_context.h> |
#include <asm/mmu_context.h> |
111 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
112 |
|
|
113 |
/* |
/* |
114 |
* Get the address of the live pt_regs for the specified task. |
* Get the address of the live pt_regs for the specified task. |
115 |
@@ -760,6 +763,10 @@ asmlinkage long sys_ptrace(long request, |
@@ -760,6 +761,8 @@ asmlinkage long sys_ptrace(long request, |
116 |
{ |
{ |
117 |
struct task_struct *child; |
struct task_struct *child; |
118 |
int ret; |
int ret; |
119 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
120 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
121 |
|
|
122 |
lock_kernel(); |
lock_kernel(); |
123 |
ret = -EPERM; |
ret = -EPERM; |
124 |
--- linux-2.6.15-53.75.orig/arch/mips/kernel/ptrace32.c |
--- linux-2.6.15-55.87.orig/arch/mips/kernel/ptrace32.c |
125 |
+++ linux-2.6.15-53.75/arch/mips/kernel/ptrace32.c |
+++ linux-2.6.15-55.87/arch/mips/kernel/ptrace32.c |
126 |
@@ -35,6 +35,9 @@ |
@@ -35,6 +35,7 @@ |
127 |
#include <asm/system.h> |
#include <asm/system.h> |
128 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
129 |
#include <asm/bootinfo.h> |
#include <asm/bootinfo.h> |
130 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
131 |
|
|
132 |
int ptrace_getregs (struct task_struct *child, __s64 __user *data); |
int ptrace_getregs (struct task_struct *child, __s64 __user *data); |
133 |
int ptrace_setregs (struct task_struct *child, __s64 __user *data); |
int ptrace_setregs (struct task_struct *child, __s64 __user *data); |
134 |
@@ -50,6 +53,10 @@ asmlinkage int sys32_ptrace(int request, |
@@ -50,6 +51,8 @@ asmlinkage int sys32_ptrace(int request, |
135 |
{ |
{ |
136 |
struct task_struct *child; |
struct task_struct *child; |
137 |
int ret; |
int ret; |
138 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
139 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
140 |
|
|
141 |
#if 0 |
#if 0 |
142 |
printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", |
printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", |
143 |
--- linux-2.6.15-53.75.orig/arch/powerpc/kernel/ptrace32.c |
--- linux-2.6.15-55.87.orig/arch/powerpc/kernel/ptrace32.c |
144 |
+++ linux-2.6.15-53.75/arch/powerpc/kernel/ptrace32.c |
+++ linux-2.6.15-55.87/arch/powerpc/kernel/ptrace32.c |
145 |
@@ -33,6 +33,9 @@ |
@@ -33,6 +33,7 @@ |
146 |
#include <asm/page.h> |
#include <asm/page.h> |
147 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
148 |
#include <asm/system.h> |
#include <asm/system.h> |
149 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
150 |
|
|
151 |
#include "ptrace-common.h" |
#include "ptrace-common.h" |
152 |
|
|
153 |
@@ -46,6 +49,10 @@ long compat_sys_ptrace(int request, int |
@@ -46,6 +47,8 @@ long compat_sys_ptrace(int request, int |
154 |
{ |
{ |
155 |
struct task_struct *child; |
struct task_struct *child; |
156 |
int ret = -EPERM; |
int ret = -EPERM; |
157 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
158 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
159 |
|
|
160 |
lock_kernel(); |
lock_kernel(); |
161 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
162 |
--- linux-2.6.15-53.75.orig/arch/s390/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/s390/kernel/ptrace.c |
163 |
+++ linux-2.6.15-53.75/arch/s390/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/s390/kernel/ptrace.c |
164 |
@@ -41,6 +41,9 @@ |
@@ -41,6 +41,7 @@ |
165 |
#include <asm/system.h> |
#include <asm/system.h> |
166 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
167 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
168 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
169 |
|
|
170 |
#ifdef CONFIG_S390_SUPPORT |
#ifdef CONFIG_S390_SUPPORT |
171 |
#include "compat_ptrace.h" |
#include "compat_ptrace.h" |
172 |
@@ -711,6 +714,10 @@ sys_ptrace(long request, long pid, long |
@@ -711,6 +712,8 @@ sys_ptrace(long request, long pid, long |
173 |
struct task_struct *child; |
struct task_struct *child; |
174 |
int ret; |
int ret; |
175 |
|
|
176 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
177 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
178 |
lock_kernel(); |
lock_kernel(); |
179 |
|
|
180 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
181 |
--- linux-2.6.15-53.75.orig/arch/sparc/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/sparc/kernel/ptrace.c |
182 |
+++ linux-2.6.15-53.75/arch/sparc/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/sparc/kernel/ptrace.c |
183 |
@@ -23,6 +23,9 @@ |
@@ -23,6 +23,7 @@ |
184 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
185 |
#include <asm/system.h> |
#include <asm/system.h> |
186 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
187 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
188 |
|
|
189 |
#define MAGIC_CONSTANT 0x80000000 |
#define MAGIC_CONSTANT 0x80000000 |
190 |
|
|
191 |
@@ -267,6 +270,12 @@ asmlinkage void do_ptrace(struct pt_regs |
@@ -267,6 +268,10 @@ asmlinkage void do_ptrace(struct pt_regs |
192 |
unsigned long addr2 = regs->u_regs[UREG_I4]; |
unsigned long addr2 = regs->u_regs[UREG_I4]; |
193 |
struct task_struct *child; |
struct task_struct *child; |
194 |
int ret; |
int ret; |
195 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) { |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) { |
|
196 |
+ pt_error_return(regs, EPERM); |
+ pt_error_return(regs, EPERM); |
197 |
+ return; |
+ return; |
198 |
+ } |
+ } |
|
+ /***** TOMOYO Linux end. *****/ |
|
199 |
|
|
200 |
lock_kernel(); |
lock_kernel(); |
201 |
#ifdef DEBUG_PTRACE |
#ifdef DEBUG_PTRACE |
202 |
--- linux-2.6.15-53.75.orig/arch/sparc64/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/arch/sparc64/kernel/ptrace.c |
203 |
+++ linux-2.6.15-53.75/arch/sparc64/kernel/ptrace.c |
+++ linux-2.6.15-55.87/arch/sparc64/kernel/ptrace.c |
204 |
@@ -32,6 +32,9 @@ |
@@ -32,6 +32,7 @@ |
205 |
#include <asm/spitfire.h> |
#include <asm/spitfire.h> |
206 |
#include <asm/page.h> |
#include <asm/page.h> |
207 |
#include <asm/cpudata.h> |
#include <asm/cpudata.h> |
208 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
209 |
|
|
210 |
/* Returning from ptrace is a bit tricky because the syscall return |
/* Returning from ptrace is a bit tricky because the syscall return |
211 |
* low level code assumes any value returned which is negative and |
* low level code assumes any value returned which is negative and |
212 |
@@ -176,6 +179,12 @@ asmlinkage void do_ptrace(struct pt_regs |
@@ -176,6 +177,10 @@ asmlinkage void do_ptrace(struct pt_regs |
213 |
unsigned long addr2 = regs->u_regs[UREG_I4]; |
unsigned long addr2 = regs->u_regs[UREG_I4]; |
214 |
struct task_struct *child; |
struct task_struct *child; |
215 |
int ret; |
int ret; |
216 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) { |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) { |
|
217 |
+ pt_error_return(regs, EPERM); |
+ pt_error_return(regs, EPERM); |
218 |
+ return; |
+ return; |
219 |
+ } |
+ } |
|
+ /***** TOMOYO Linux end. *****/ |
|
220 |
|
|
221 |
if (test_thread_flag(TIF_32BIT)) { |
if (test_thread_flag(TIF_32BIT)) { |
222 |
addr &= 0xffffffffUL; |
addr &= 0xffffffffUL; |
223 |
--- linux-2.6.15-53.75.orig/arch/x86_64/ia32/ptrace32.c |
--- linux-2.6.15-55.87.orig/arch/x86_64/ia32/ptrace32.c |
224 |
+++ linux-2.6.15-53.75/arch/x86_64/ia32/ptrace32.c |
+++ linux-2.6.15-55.87/arch/x86_64/ia32/ptrace32.c |
225 |
@@ -27,6 +27,9 @@ |
@@ -27,6 +27,7 @@ |
226 |
#include <asm/debugreg.h> |
#include <asm/debugreg.h> |
227 |
#include <asm/i387.h> |
#include <asm/i387.h> |
228 |
#include <asm/fpu32.h> |
#include <asm/fpu32.h> |
229 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
230 |
|
|
231 |
/* determines which flags the user has access to. */ |
/* determines which flags the user has access to. */ |
232 |
/* 1 = access 0 = no access */ |
/* 1 = access 0 = no access */ |
233 |
@@ -233,6 +236,10 @@ asmlinkage long sys32_ptrace(long reques |
@@ -233,6 +234,8 @@ asmlinkage long sys32_ptrace(long reques |
234 |
void __user *datap = compat_ptr(data); |
void __user *datap = compat_ptr(data); |
235 |
int ret; |
int ret; |
236 |
__u32 val; |
__u32 val; |
237 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
238 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
239 |
|
|
240 |
switch (request) { |
switch (request) { |
241 |
default: |
default: |
242 |
--- linux-2.6.15-53.75.orig/fs/Kconfig |
--- linux-2.6.15-55.87.orig/fs/compat.c |
243 |
+++ linux-2.6.15-53.75/fs/Kconfig |
+++ linux-2.6.15-55.87/fs/compat.c |
244 |
@@ -1910,5 +1910,7 @@ endmenu |
@@ -52,6 +52,7 @@ |
|
|
|
|
source "fs/nls/Kconfig" |
|
|
|
|
|
+source "fs/Kconfig.ccs" |
|
|
+ |
|
|
endmenu |
|
|
|
|
|
--- linux-2.6.15-53.75.orig/fs/Makefile |
|
|
+++ linux-2.6.15-53.75/fs/Makefile |
|
|
@@ -108,3 +108,5 @@ obj-$(CONFIG_CONFIGFS_FS) += configfs/ |
|
|
obj-$(CONFIG_OCFS2_FS) += ocfs2/ |
|
|
obj-$(CONFIG_UNION_FS) += unionfs/ |
|
|
obj-$(CONFIG_DAZUKO) += dazuko/ |
|
|
+ |
|
|
+include $(srctree)/fs/Makefile-2.6.ccs |
|
|
--- linux-2.6.15-53.75.orig/fs/attr.c |
|
|
+++ linux-2.6.15-53.75/fs/attr.c |
|
|
@@ -15,6 +15,9 @@ |
|
|
#include <linux/quotaops.h> |
|
|
#include <linux/security.h> |
|
|
#include <linux/time.h> |
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
|
|
|
|
/* Taken over from the old code... */ |
|
|
|
|
|
@@ -153,12 +156,28 @@ int notify_change(struct dentry * dentry |
|
|
|
|
|
if (inode->i_op && inode->i_op->setattr) { |
|
|
error = security_inode_setattr(dentry, attr); |
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (!error && (ia_valid & ATTR_MODE) && |
|
|
+ !ccs_capable(CCS_SYS_CHMOD)) |
|
|
+ error = -EPERM; |
|
|
+ if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) && |
|
|
+ !ccs_capable(CCS_SYS_CHOWN)) |
|
|
+ error = -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
if (!error) |
|
|
error = inode->i_op->setattr(dentry, attr); |
|
|
} else { |
|
|
error = inode_change_ok(inode, attr); |
|
|
if (!error) |
|
|
error = security_inode_setattr(dentry, attr); |
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (!error && (ia_valid & ATTR_MODE) && |
|
|
+ !ccs_capable(CCS_SYS_CHMOD)) |
|
|
+ error = -EPERM; |
|
|
+ if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) && |
|
|
+ !ccs_capable(CCS_SYS_CHOWN)) |
|
|
+ error = -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
if (!error) { |
|
|
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || |
|
|
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) |
|
|
--- linux-2.6.15-53.75.orig/fs/compat.c |
|
|
+++ linux-2.6.15-53.75/fs/compat.c |
|
|
@@ -52,6 +52,9 @@ |
|
245 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
246 |
#include <asm/mmu_context.h> |
#include <asm/mmu_context.h> |
247 |
#include <asm/ioctls.h> |
#include <asm/ioctls.h> |
248 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
249 |
|
|
250 |
/* |
/* |
251 |
* Not all architectures have sys_utime, so implement this in terms |
* Not all architectures have sys_utime, so implement this in terms |
252 |
@@ -353,6 +356,10 @@ asmlinkage long compat_sys_ioctl(unsigne |
@@ -353,6 +354,8 @@ asmlinkage long compat_sys_ioctl(unsigne |
253 |
|
|
254 |
/* RED-PEN how should LSM module know it's handling 32bit? */ |
/* RED-PEN how should LSM module know it's handling 32bit? */ |
255 |
error = security_file_ioctl(filp, cmd, arg); |
error = security_file_ioctl(filp, cmd, arg); |
|
+ /***** TOMOYO Linux start. *****/ |
|
256 |
+ if (!error) |
+ if (!error) |
257 |
+ error = ccs_check_ioctl_permission(filp, cmd, arg); |
+ error = ccs_ioctl_permission(filp, cmd, arg); |
|
+ /***** TOMOYO Linux end. *****/ |
|
258 |
if (error) |
if (error) |
259 |
goto out_fput; |
goto out_fput; |
260 |
|
|
261 |
@@ -377,6 +384,12 @@ asmlinkage long compat_sys_ioctl(unsigne |
@@ -377,6 +380,10 @@ asmlinkage long compat_sys_ioctl(unsigne |
262 |
/*FALL THROUGH*/ |
/*FALL THROUGH*/ |
263 |
|
|
264 |
default: |
default: |
|
+ /***** TOMOYO Linux start. *****/ |
|
265 |
+ if (!ccs_capable(CCS_SYS_IOCTL)) { |
+ if (!ccs_capable(CCS_SYS_IOCTL)) { |
266 |
+ error = -EPERM; |
+ error = -EPERM; |
267 |
+ goto out_fput; |
+ goto out_fput; |
268 |
+ } |
+ } |
|
+ /***** TOMOYO Linux end. *****/ |
|
269 |
if (filp->f_op && filp->f_op->compat_ioctl) { |
if (filp->f_op && filp->f_op->compat_ioctl) { |
270 |
error = filp->f_op->compat_ioctl(filp, cmd, arg); |
error = filp->f_op->compat_ioctl(filp, cmd, arg); |
271 |
if (error != -ENOIOCTLCMD) |
if (error != -ENOIOCTLCMD) |
272 |
@@ -1480,7 +1493,7 @@ int compat_do_execve(char * filename, |
@@ -1480,7 +1487,7 @@ int compat_do_execve(char * filename, |
273 |
if (retval < 0) |
if (retval < 0) |
274 |
goto out; |
goto out; |
275 |
|
|
276 |
- retval = search_binary_handler(bprm, regs); |
- retval = search_binary_handler(bprm, regs); |
277 |
+ retval = search_binary_handler_with_transition(bprm, regs); |
+ retval = ccs_search_binary_handler(bprm, regs); |
278 |
if (retval >= 0) { |
if (retval >= 0) { |
279 |
free_arg_pages(bprm); |
free_arg_pages(bprm); |
280 |
|
|
281 |
--- linux-2.6.15-53.75.orig/fs/exec.c |
--- linux-2.6.15-55.87.orig/fs/exec.c |
282 |
+++ linux-2.6.15-53.75/fs/exec.c |
+++ linux-2.6.15-55.87/fs/exec.c |
283 |
@@ -57,6 +57,10 @@ |
@@ -57,6 +57,8 @@ |
284 |
#include <linux/kmod.h> |
#include <linux/kmod.h> |
285 |
#endif |
#endif |
286 |
|
|
287 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
288 |
+ |
+ |
289 |
int core_uses_pid; |
int core_uses_pid; |
290 |
char core_pattern[65] = "core"; |
char core_pattern[65] = "core"; |
291 |
int suid_dumpable = 0; |
int suid_dumpable = 0; |
292 |
@@ -139,6 +143,13 @@ asmlinkage long sys_uselib(const char __ |
@@ -139,6 +141,10 @@ SYSCALL_DEFINE1(uselib, const char __use |
293 |
if (error) |
if (error) |
294 |
goto exit; |
goto exit; |
295 |
|
|
296 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_uselib_permission(nd.dentry, nd.mnt); |
|
+ /* 01 means "read". */ |
|
|
+ error = ccs_check_open_permission(nd.dentry, nd.mnt, 01); |
|
297 |
+ if (error) |
+ if (error) |
298 |
+ goto exit; |
+ goto exit; |
|
+ /***** TOMOYO Linux end. *****/ |
|
299 |
+ |
+ |
300 |
file = nameidata_to_filp(&nd, O_RDONLY); |
file = nameidata_to_filp(&nd, O_RDONLY); |
301 |
error = PTR_ERR(file); |
error = PTR_ERR(file); |
302 |
if (IS_ERR(file)) |
if (IS_ERR(file)) |
303 |
@@ -488,6 +499,13 @@ struct file *open_exec(const char *name) |
@@ -488,6 +494,9 @@ struct file *open_exec(const char *name) |
304 |
int err = vfs_permission(&nd, MAY_EXEC); |
int err = vfs_permission(&nd, MAY_EXEC); |
305 |
if (!err && !(inode->i_mode & 0111)) |
if (!err && !(inode->i_mode & 0111)) |
306 |
err = -EACCES; |
err = -EACCES; |
307 |
+ /***** TOMOYO Linux start. *****/ |
+ if (!err) |
308 |
+ if (!err && (current->ccs_flags & |
+ err = ccs_open_exec_permission(nd.dentry, |
309 |
+ CCS_CHECK_READ_FOR_OPEN_EXEC)) |
+ nd.mnt); |
|
+ /* 01 means "read". */ |
|
|
+ err = ccs_check_open_permission(nd.dentry, |
|
|
+ nd.mnt, 01); |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
310 |
file = ERR_PTR(err); |
file = ERR_PTR(err); |
311 |
if (!err) { |
if (!err) { |
312 |
file = nameidata_to_filp(&nd, O_RDONLY); |
file = nameidata_to_filp(&nd, O_RDONLY); |
313 |
@@ -1197,7 +1215,8 @@ int do_execve(char * filename, |
@@ -1204,7 +1213,8 @@ int do_execve(char * filename, |
314 |
if (retval < 0) |
if (retval < 0) |
315 |
goto out; |
goto out; |
316 |
|
|
317 |
- retval = search_binary_handler(bprm,regs); |
- retval = search_binary_handler(bprm,regs); |
318 |
+ retval = search_binary_handler_with_transition(bprm, regs); |
+ retval = ccs_search_binary_handler(bprm, regs); |
319 |
+ |
+ |
320 |
if (retval >= 0) { |
if (retval >= 0) { |
321 |
free_arg_pages(bprm); |
free_arg_pages(bprm); |
322 |
|
|
323 |
--- linux-2.6.15-53.75.orig/fs/fcntl.c |
--- linux-2.6.15-55.87.orig/fs/fcntl.c |
324 |
+++ linux-2.6.15-53.75/fs/fcntl.c |
+++ linux-2.6.15-55.87/fs/fcntl.c |
325 |
@@ -21,6 +21,9 @@ |
@@ -21,6 +21,7 @@ |
326 |
#include <asm/poll.h> |
#include <asm/poll.h> |
327 |
#include <asm/siginfo.h> |
#include <asm/siginfo.h> |
328 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
329 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
330 |
|
|
331 |
void fastcall set_close_on_exec(unsigned int fd, int flag) |
void fastcall set_close_on_exec(unsigned int fd, int flag) |
332 |
{ |
{ |
333 |
@@ -211,6 +214,11 @@ static int setfl(int fd, struct file * f |
@@ -211,6 +212,9 @@ static int setfl(int fd, struct file * f |
334 |
if (!(arg & O_APPEND) && IS_APPEND(inode)) |
if (!(arg & O_APPEND) && IS_APPEND(inode)) |
335 |
return -EPERM; |
return -EPERM; |
336 |
|
|
337 |
+ /***** TOMOYO Linux start. *****/ |
+ if (!(arg & O_APPEND) && ccs_rewrite_permission(filp)) |
|
+ if (!(arg & O_APPEND) && ccs_check_rewrite_permission(filp)) |
|
338 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
339 |
+ |
+ |
340 |
/* O_NOATIME can only be set by the owner or superuser */ |
/* O_NOATIME can only be set by the owner or superuser */ |
341 |
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME)) |
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME)) |
342 |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
343 |
--- linux-2.6.15-53.75.orig/fs/ioctl.c |
--- linux-2.6.15-55.87.orig/fs/ioctl.c |
344 |
+++ linux-2.6.15-53.75/fs/ioctl.c |
+++ linux-2.6.15-55.87/fs/ioctl.c |
345 |
@@ -15,6 +15,9 @@ |
@@ -15,6 +15,7 @@ |
346 |
|
|
347 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
348 |
#include <asm/ioctls.h> |
#include <asm/ioctls.h> |
349 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
350 |
|
|
351 |
static long do_ioctl(struct file *filp, unsigned int cmd, |
static long do_ioctl(struct file *filp, unsigned int cmd, |
352 |
unsigned long arg) |
unsigned long arg) |
353 |
@@ -23,6 +26,10 @@ static long do_ioctl(struct file *filp, |
@@ -167,6 +168,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd, |
|
|
|
|
if (!filp->f_op) |
|
|
goto out; |
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (!ccs_capable(CCS_SYS_IOCTL)) |
|
|
+ return -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
|
|
|
if (filp->f_op->unlocked_ioctl) { |
|
|
error = filp->f_op->unlocked_ioctl(filp, cmd, arg); |
|
|
@@ -167,6 +174,10 @@ asmlinkage long sys_ioctl(unsigned int f |
|
354 |
goto out; |
goto out; |
355 |
|
|
356 |
error = security_file_ioctl(filp, cmd, arg); |
error = security_file_ioctl(filp, cmd, arg); |
|
+ /***** TOMOYO Linux start. *****/ |
|
357 |
+ if (!error) |
+ if (!error) |
358 |
+ error = ccs_check_ioctl_permission(filp, cmd, arg); |
+ error = ccs_ioctl_permission(filp, cmd, arg); |
|
+ /***** TOMOYO Linux end. *****/ |
|
359 |
if (error) |
if (error) |
360 |
goto out_fput; |
goto out_fput; |
361 |
|
|
362 |
--- linux-2.6.15-53.75.orig/fs/namei.c |
--- linux-2.6.15-55.87.orig/fs/namei.c |
363 |
+++ linux-2.6.15-53.75/fs/namei.c |
+++ linux-2.6.15-55.87/fs/namei.c |
364 |
@@ -34,6 +34,10 @@ |
@@ -34,6 +34,8 @@ |
365 |
|
|
366 |
#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) |
#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) |
367 |
|
|
368 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
369 |
+ |
+ |
370 |
/* [Feb-1997 T. Schoebel-Theuer] |
/* [Feb-1997 T. Schoebel-Theuer] |
371 |
* Fundamental changes in the pathname lookup mechanisms (namei) |
* Fundamental changes in the pathname lookup mechanisms (namei) |
372 |
* were necessary because of omirr. The reason is that omirr needs |
* were necessary because of omirr. The reason is that omirr needs |
373 |
@@ -1488,6 +1492,13 @@ int may_open(struct nameidata *nd, int a |
@@ -1488,6 +1490,11 @@ int may_open(struct nameidata *nd, int a |
374 |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
375 |
return -EPERM; |
return -EPERM; |
376 |
|
|
|
+ /***** TOMOYO Linux start. *****/ |
|
377 |
+ /* includes O_APPEND and O_TRUNC checks */ |
+ /* includes O_APPEND and O_TRUNC checks */ |
378 |
+ error = ccs_check_open_permission(dentry, nd->mnt, flag); |
+ error = ccs_open_permission(dentry, nd->mnt, flag); |
379 |
+ if (error) |
+ if (error) |
380 |
+ return error; |
+ return error; |
|
+ /***** TOMOYO Linux end. *****/ |
|
381 |
+ |
+ |
382 |
/* |
/* |
383 |
* Ensure there are no outstanding leases on the file. |
* Ensure there are no outstanding leases on the file. |
384 |
*/ |
*/ |
385 |
@@ -1519,6 +1530,9 @@ int may_open(struct nameidata *nd, int a |
@@ -1594,6 +1601,9 @@ do_last: |
|
return 0; |
|
|
} |
|
|
|
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo_vfs.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
|
/* |
|
|
* open_namei() |
|
|
* |
|
|
@@ -1594,6 +1608,11 @@ do_last: |
|
386 |
if (!path.dentry->d_inode) { |
if (!path.dentry->d_inode) { |
387 |
if (!IS_POSIXACL(dir->d_inode)) |
if (!IS_POSIXACL(dir->d_inode)) |
388 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
389 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_mknod_permission(dir->d_inode, path.dentry, |
390 |
+ error = ccs_check_mknod_permission(dir->d_inode, path.dentry, |
+ nd->mnt, mode, 0); |
|
+ nd->path.mnt, mode, 0); |
|
391 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
392 |
error = vfs_create(dir->d_inode, path.dentry, mode, nd); |
error = vfs_create(dir->d_inode, path.dentry, mode, nd); |
393 |
up(&dir->d_inode->i_sem); |
up(&dir->d_inode->i_sem); |
394 |
dput(nd->dentry); |
dput(nd->dentry); |
395 |
@@ -1781,6 +1800,12 @@ asmlinkage long sys_mknod(const char __u |
@@ -1781,6 +1791,9 @@ SYSCALL_DEFINE3(mknod, const char __user |
396 |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
397 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
398 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
399 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_mknod_permission(nd.dentry->d_inode, dentry, |
400 |
+ error = ccs_check_mknod_permission(nd.path.dentry->d_inode, |
+ nd.mnt, mode, dev); |
|
+ dentry, nd.path.mnt, mode, |
|
|
+ new_decode_dev(dev)); |
|
401 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
402 |
switch (mode & S_IFMT) { |
switch (mode & S_IFMT) { |
403 |
case 0: case S_IFREG: |
case 0: case S_IFREG: |
404 |
error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); |
error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); |
405 |
@@ -1849,6 +1874,12 @@ asmlinkage long sys_mkdir(const char __u |
@@ -1849,6 +1862,9 @@ SYSCALL_DEFINE2(mkdir, const char __user |
406 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
407 |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
408 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
409 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_mkdir_permission(nd.dentry->d_inode, |
410 |
+ error = ccs_check_mkdir_permission(nd.dentry->d_inode, |
+ dentry, nd.mnt, mode); |
|
+ dentry, nd.mnt, |
|
|
+ mode); |
|
411 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
412 |
error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); |
error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); |
413 |
dput(dentry); |
dput(dentry); |
414 |
} |
} |
415 |
@@ -1952,6 +1983,11 @@ asmlinkage long sys_rmdir(const char __u |
@@ -1952,6 +1968,9 @@ SYSCALL_DEFINE1(rmdir, const char __user |
416 |
dentry = lookup_hash(&nd); |
dentry = lookup_hash(&nd); |
417 |
error = PTR_ERR(dentry); |
error = PTR_ERR(dentry); |
418 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
419 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_rmdir_permission(nd.dentry->d_inode, dentry, |
420 |
+ error = ccs_check_rmdir_permission(nd.dentry->d_inode, dentry, |
+ nd.mnt); |
|
+ nd.mnt); |
|
421 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
422 |
error = vfs_rmdir(nd.dentry->d_inode, dentry); |
error = vfs_rmdir(nd.dentry->d_inode, dentry); |
423 |
dput(dentry); |
dput(dentry); |
424 |
} |
} |
425 |
@@ -2027,6 +2063,11 @@ asmlinkage long sys_unlink(const char __ |
@@ -2027,6 +2046,9 @@ SYSCALL_DEFINE1(unlink, const char __use |
426 |
inode = dentry->d_inode; |
inode = dentry->d_inode; |
427 |
if (inode) |
if (inode) |
428 |
atomic_inc(&inode->i_count); |
atomic_inc(&inode->i_count); |
429 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_unlink_permission(nd.dentry->d_inode, dentry, |
430 |
+ error = ccs_check_unlink_permission(nd.dentry->d_inode, dentry, |
+ nd.mnt); |
|
+ nd.mnt); |
|
431 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
432 |
error = vfs_unlink(nd.dentry->d_inode, dentry); |
error = vfs_unlink(nd.dentry->d_inode, dentry); |
433 |
exit2: |
exit2: |
434 |
dput(dentry); |
dput(dentry); |
435 |
@@ -2088,6 +2129,12 @@ asmlinkage long sys_symlink(const char _ |
@@ -2089,6 +2111,9 @@ SYSCALL_DEFINE2(symlink, const char __us |
436 |
dentry = lookup_create(&nd, 0); |
dentry = lookup_create(&nd, 0); |
437 |
error = PTR_ERR(dentry); |
error = PTR_ERR(dentry); |
438 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
439 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_symlink_permission(nd.dentry->d_inode, |
440 |
+ error = ccs_check_symlink_permission(nd.dentry->d_inode, |
+ dentry, nd.mnt, from); |
|
+ dentry, nd.mnt, |
|
|
+ from); |
|
441 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
442 |
error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); |
error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); |
443 |
dput(dentry); |
dput(dentry); |
444 |
} |
} |
445 |
@@ -2170,6 +2217,12 @@ asmlinkage long sys_link(const char __us |
@@ -2172,6 +2197,9 @@ SYSCALL_DEFINE2(link, const char __user |
446 |
new_dentry = lookup_create(&nd, 0); |
new_dentry = lookup_create(&nd, 0); |
447 |
error = PTR_ERR(new_dentry); |
error = PTR_ERR(new_dentry); |
448 |
if (!IS_ERR(new_dentry)) { |
if (!IS_ERR(new_dentry)) { |
449 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_link_permission(old_nd.dentry, nd.dentry->d_inode, |
450 |
+ error = ccs_check_link_permission(old_nd.dentry, |
+ new_dentry, nd.mnt); |
|
+ nd.dentry->d_inode, |
|
|
+ new_dentry, nd.mnt); |
|
451 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
452 |
error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); |
error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); |
453 |
dput(new_dentry); |
dput(new_dentry); |
454 |
} |
} |
455 |
@@ -2390,6 +2443,13 @@ static inline int do_rename(const char * |
@@ -2392,6 +2420,9 @@ static inline int do_rename(const char * |
456 |
if (new_dentry == trap) |
if (new_dentry == trap) |
457 |
goto exit5; |
goto exit5; |
458 |
|
|
459 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_rename_permission(old_dir->d_inode, old_dentry, |
460 |
+ error = ccs_check_rename_permission(old_dir->d_inode, old_dentry, |
+ new_dir->d_inode, new_dentry, newnd.mnt); |
|
+ new_dir->d_inode, new_dentry, |
|
|
+ newnd.mnt); |
|
461 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
|
+ |
|
462 |
error = vfs_rename(old_dir->d_inode, old_dentry, |
error = vfs_rename(old_dir->d_inode, old_dentry, |
463 |
new_dir->d_inode, new_dentry); |
new_dir->d_inode, new_dentry); |
464 |
exit5: |
exit5: |
465 |
--- linux-2.6.15-53.75.orig/fs/namespace.c |
--- linux-2.6.15-55.87.orig/fs/namespace.c |
466 |
+++ linux-2.6.15-53.75/fs/namespace.c |
+++ linux-2.6.15-55.87/fs/namespace.c |
467 |
@@ -25,6 +25,12 @@ |
@@ -25,6 +25,7 @@ |
468 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
469 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
470 |
#include "pnode.h" |
#include "pnode.h" |
471 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
472 |
|
|
473 |
extern int __init init_rootfs(void); |
extern int __init init_rootfs(void); |
474 |
|
|
475 |
@@ -504,6 +510,11 @@ static int do_umount(struct vfsmount *mn |
@@ -501,6 +502,8 @@ static int do_umount(struct vfsmount *mn |
476 |
|
LIST_HEAD(umount_list); |
477 |
|
|
478 |
|
retval = security_sb_umount(mnt, flags); |
479 |
|
+ if (!retval) |
480 |
|
+ retval = ccs_umount_permission(mnt, flags); |
481 |
if (retval) |
if (retval) |
482 |
return retval; |
return retval; |
483 |
|
|
484 |
+ /***** SAKURA Linux start. *****/ |
@@ -1264,6 +1267,7 @@ int copy_mount_options(const void __user |
485 |
+ if (ccs_may_umount(mnt)) |
long do_mount(char *dev_name, char *dir_name, char *type_page, |
486 |
+ return -EPERM; |
unsigned long flags, void *data_page) |
|
+ /***** SAKURA Linux end. *****/ |
|
|
+ |
|
|
/* |
|
|
* Allow userspace to request a mountpoint be expired rather than |
|
|
* unmounting unconditionally. Unmount only happens if: |
|
|
@@ -592,6 +603,10 @@ asmlinkage long sys_umount(char __user * |
|
487 |
{ |
{ |
488 |
|
+ const unsigned long original_flags = flags; |
489 |
struct nameidata nd; |
struct nameidata nd; |
490 |
int retval; |
int retval = 0; |
491 |
+ /***** TOMOYO Linux start. *****/ |
int mnt_flags = 0; |
492 |
+ if (!ccs_capable(CCS_SYS_UMOUNT)) |
@@ -1297,6 +1301,9 @@ long do_mount(char *dev_name, char *dir_ |
493 |
+ return -EPERM; |
return retval; |
|
+ /***** TOMOYO Linux end. *****/ |
|
494 |
|
|
495 |
retval = __user_walk(name, LOOKUP_FOLLOW, &nd); |
retval = security_sb_mount(dev_name, &nd, type_page, flags, data_page); |
496 |
|
+ if (!retval) |
497 |
|
+ retval = ccs_mount_permission(dev_name, &nd, type_page, |
498 |
|
+ original_flags, data_page); |
499 |
if (retval) |
if (retval) |
500 |
@@ -879,6 +894,11 @@ static int do_loopback(struct nameidata |
goto dput_out; |
|
|
|
|
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
|
|
goto out; |
|
|
+ /***** SAKURA Linux start. *****/ |
|
|
+ err = -EPERM; |
|
|
+ if (ccs_may_mount(nd)) |
|
|
+ goto out; |
|
|
+ /***** SAKURA Linux end. *****/ |
|
|
|
|
|
err = -ENOMEM; |
|
|
if (recurse) |
|
|
@@ -963,7 +983,11 @@ static int do_move_mount(struct nameidat |
|
|
err = -EINVAL; |
|
|
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
|
|
goto out; |
|
|
- |
|
|
+ /***** SAKURA Linux start. *****/ |
|
|
+ err = -EPERM; |
|
|
+ if (ccs_may_umount(old_nd.mnt) || ccs_may_mount(nd)) |
|
|
+ goto out; |
|
|
+ /***** SAKURA Linux end. *****/ |
|
|
err = -ENOENT; |
|
|
down(&nd->dentry->d_inode->i_sem); |
|
|
if (IS_DEADDIR(nd->dentry->d_inode)) |
|
|
@@ -1065,6 +1089,11 @@ int do_add_mount(struct vfsmount *newmnt |
|
|
err = -EINVAL; |
|
|
if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode)) |
|
|
goto unlock; |
|
|
+ /***** SAKURA Linux start. *****/ |
|
|
+ err = -EPERM; |
|
|
+ if (ccs_may_mount(nd)) |
|
|
+ goto unlock; |
|
|
+ /***** SAKURA Linux end. *****/ |
|
|
|
|
|
newmnt->mnt_flags = mnt_flags; |
|
|
if ((err = graft_tree(newmnt, nd))) |
|
|
@@ -1282,6 +1311,17 @@ long do_mount(char *dev_name, char *dir_ |
|
|
if (data_page) |
|
|
((char *)data_page)[PAGE_SIZE - 1] = 0; |
|
|
|
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (!ccs_capable(CCS_SYS_MOUNT)) |
|
|
+ return -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
+ /***** SAKURA Linux start. *****/ |
|
|
+ retval = ccs_check_mount_permission(dev_name, dir_name, type_page, |
|
|
+ &flags); |
|
|
+ if (retval) |
|
|
+ return retval; |
|
|
+ /***** SAKURA Linux end. *****/ |
|
|
+ |
|
|
/* Separate the per-mountpoint flags */ |
|
|
if (flags & MS_NOSUID) |
|
|
mnt_flags |= MNT_NOSUID; |
|
|
@@ -1546,6 +1586,10 @@ asmlinkage long sys_pivot_root(const cha |
|
|
|
|
|
if (!capable(CAP_SYS_ADMIN)) |
|
|
return -EPERM; |
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (!ccs_capable(CCS_SYS_PIVOT_ROOT)) |
|
|
+ return -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
501 |
|
|
502 |
lock_kernel(); |
@@ -1561,6 +1568,8 @@ SYSCALL_DEFINE2(pivot_root, const char _ |
|
|
|
|
@@ -1562,6 +1606,10 @@ asmlinkage long sys_pivot_root(const cha |
|
503 |
goto out1; |
goto out1; |
504 |
|
|
505 |
error = security_sb_pivotroot(&old_nd, &new_nd); |
error = security_sb_pivotroot(&old_nd, &new_nd); |
|
+ /***** SAKURA Linux start. *****/ |
|
506 |
+ if (!error) |
+ if (!error) |
507 |
+ error = ccs_check_pivot_root_permission(&old_nd, &new_nd); |
+ error = ccs_pivot_root_permission(&old_nd, &new_nd); |
|
+ /***** SAKURA Linux end. *****/ |
|
508 |
if (error) { |
if (error) { |
509 |
path_release(&old_nd); |
path_release(&old_nd); |
510 |
goto out1; |
goto out1; |
511 |
--- linux-2.6.15-53.75.orig/fs/open.c |
--- linux-2.6.15-55.87.orig/fs/open.c |
512 |
+++ linux-2.6.15-53.75/fs/open.c |
+++ linux-2.6.15-55.87/fs/open.c |
513 |
@@ -28,6 +28,13 @@ |
@@ -28,6 +28,8 @@ |
514 |
|
|
515 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
516 |
|
|
517 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
518 |
+ |
+ |
519 |
int vfs_statfs(struct super_block *sb, struct kstatfs *buf) |
int vfs_statfs(struct super_block *sb, struct kstatfs *buf) |
520 |
{ |
{ |
521 |
int retval = -ENODEV; |
int retval = -ENODEV; |
522 |
@@ -285,6 +292,10 @@ static inline long do_sys_truncate(const |
@@ -287,6 +289,8 @@ static inline long do_sys_truncate(const |
523 |
if (error) |
if (error) |
524 |
goto dput_and_out; |
goto dput_and_out; |
525 |
|
|
526 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_truncate_permission(nd.dentry, nd.mnt); |
|
+ error = ccs_check_truncate_permission(nd.dentry, nd.mnt, length, 0); |
|
527 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
528 |
error = locks_verify_truncate(inode, NULL, length); |
error = locks_verify_truncate(inode, NULL, length); |
529 |
if (!error) { |
if (!error) { |
530 |
DQUOT_INIT(inode); |
DQUOT_INIT(inode); |
531 |
@@ -337,7 +348,12 @@ static inline long do_sys_ftruncate(unsi |
@@ -339,7 +343,9 @@ static inline long do_sys_ftruncate(unsi |
532 |
error = -EPERM; |
error = -EPERM; |
533 |
if (IS_APPEND(inode)) |
if (IS_APPEND(inode)) |
534 |
goto out_putf; |
goto out_putf; |
535 |
- |
- |
536 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_truncate_permission(dentry, file->f_vfsmnt); |
|
+ error = ccs_check_truncate_permission(dentry, file->f_vfsmnt, length, |
|
|
+ 0); |
|
537 |
+ if (error) |
+ if (error) |
538 |
+ goto out_putf; |
+ goto out_putf; |
|
+ /***** TOMOYO Linux end. *****/ |
|
539 |
error = locks_verify_truncate(inode, file, length); |
error = locks_verify_truncate(inode, file, length); |
540 |
if (!error) |
if (!error) |
541 |
error = do_truncate(dentry, length, file); |
error = do_truncate(dentry, length, file); |
542 |
@@ -610,6 +626,14 @@ asmlinkage long sys_chroot(const char __ |
@@ -627,6 +633,8 @@ SYSCALL_DEFINE1(chroot, const char __use |
543 |
error = -EPERM; |
error = -EPERM; |
544 |
if (!capable(CAP_SYS_CHROOT)) |
if (!capable(CAP_SYS_CHROOT)) |
545 |
goto dput_and_out; |
goto dput_and_out; |
546 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_chroot_permission(&nd)) |
|
+ if (!ccs_capable(CCS_SYS_CHROOT)) |
|
|
+ goto dput_and_out; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
+ /***** SAKURA Linux start. *****/ |
|
|
+ if (ccs_check_chroot_permission(&nd)) |
|
547 |
+ goto dput_and_out; |
+ goto dput_and_out; |
|
+ /***** SAKURA Linux end. *****/ |
|
548 |
|
|
549 |
set_fs_root(current->fs, nd.mnt, nd.dentry); |
set_fs_root(current->fs, nd.mnt, nd.dentry); |
550 |
set_fs_altroot(); |
set_fs_altroot(); |
551 |
@@ -1141,6 +1165,10 @@ EXPORT_SYMBOL(sys_close); |
@@ -658,6 +666,9 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd |
552 |
|
err = -EPERM; |
553 |
|
if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) |
554 |
|
goto out_putf; |
555 |
|
+ err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode); |
556 |
|
+ if (err) |
557 |
|
+ goto out_putf; |
558 |
|
down(&inode->i_sem); |
559 |
|
if (mode == (mode_t) -1) |
560 |
|
mode = inode->i_mode; |
561 |
|
@@ -691,6 +702,9 @@ SYSCALL_DEFINE2(chmod, const char __user |
562 |
|
error = -EPERM; |
563 |
|
if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) |
564 |
|
goto dput_and_out; |
565 |
|
+ error = ccs_chmod_permission(nd.dentry, nd.mnt, mode); |
566 |
|
+ if (error) |
567 |
|
+ goto dput_and_out; |
568 |
|
|
569 |
|
down(&inode->i_sem); |
570 |
|
if (mode == (mode_t) -1) |
571 |
|
@@ -748,6 +762,8 @@ SYSCALL_DEFINE3(chown, const char __user |
572 |
|
|
573 |
|
error = user_path_walk(filename, &nd); |
574 |
|
if (!error) { |
575 |
|
+ error = ccs_chown_permission(nd.dentry, nd.mnt, user, group); |
576 |
|
+ if (!error) |
577 |
|
error = chown_common(nd.dentry, user, group); |
578 |
|
path_release(&nd); |
579 |
|
} |
580 |
|
@@ -762,6 +778,8 @@ SYSCALL_DEFINE3(lchown, const char __use |
581 |
|
|
582 |
|
error = user_path_walk_link(filename, &nd); |
583 |
|
if (!error) { |
584 |
|
+ error = ccs_chown_permission(nd.dentry, nd.mnt, user, group); |
585 |
|
+ if (!error) |
586 |
|
error = chown_common(nd.dentry, user, group); |
587 |
|
path_release(&nd); |
588 |
|
} |
589 |
|
@@ -776,6 +794,9 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd |
590 |
|
|
591 |
|
file = fget(fd); |
592 |
|
if (file) { |
593 |
|
+ error = ccs_chown_permission(file->f_dentry, file->f_vfsmnt, |
594 |
|
+ user, group); |
595 |
|
+ if (!error) |
596 |
|
error = chown_common(file->f_dentry, user, group); |
597 |
|
fput(file); |
598 |
|
} |
599 |
|
@@ -867,7 +888,9 @@ struct file *filp_open(const char * file |
600 |
|
if ((namei_flags+1) & O_ACCMODE) |
601 |
|
namei_flags++; |
602 |
|
|
603 |
|
+ ccs_save_open_mode(flags); |
604 |
|
error = open_namei(filename, namei_flags, mode, &nd); |
605 |
|
+ ccs_clear_open_mode(); |
606 |
|
if (!error) |
607 |
|
return nameidata_to_filp(&nd, flags); |
608 |
|
|
609 |
|
@@ -1159,6 +1182,8 @@ EXPORT_SYMBOL(sys_close); |
610 |
*/ |
*/ |
611 |
asmlinkage long sys_vhangup(void) |
SYSCALL_DEFINE0(vhangup) |
612 |
{ |
{ |
|
+ /***** TOMOYO Linux start. *****/ |
|
613 |
+ if (!ccs_capable(CCS_SYS_VHANGUP)) |
+ if (!ccs_capable(CCS_SYS_VHANGUP)) |
614 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
615 |
if (capable(CAP_SYS_TTY_CONFIG)) { |
if (capable(CAP_SYS_TTY_CONFIG)) { |
616 |
tty_vhangup(current->signal->tty); |
tty_vhangup(current->signal->tty); |
617 |
return 0; |
return 0; |
618 |
--- linux-2.6.15-53.75.orig/fs/proc/Makefile |
--- linux-2.6.15-55.87.orig/fs/proc/proc_misc.c |
619 |
+++ linux-2.6.15-53.75/fs/proc/Makefile |
+++ linux-2.6.15-55.87/fs/proc/proc_misc.c |
620 |
@@ -13,3 +13,6 @@ proc-y += inode.o root.o base.o ge |
@@ -629,4 +629,5 @@ void __init proc_misc_init(void) |
|
proc-$(CONFIG_PROC_KCORE) += kcore.o |
|
|
proc-$(CONFIG_PROC_VMCORE) += vmcore.o |
|
|
proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o |
|
|
+ |
|
|
+proc-$(CONFIG_SAKURA) += ccs_proc.o |
|
|
+proc-$(CONFIG_TOMOYO) += ccs_proc.o |
|
|
--- linux-2.6.15-53.75.orig/fs/proc/proc_misc.c |
|
|
+++ linux-2.6.15-53.75/fs/proc/proc_misc.c |
|
|
@@ -629,4 +629,9 @@ void __init proc_misc_init(void) |
|
621 |
if (entry) |
if (entry) |
622 |
entry->proc_fops = &proc_sysrq_trigger_operations; |
entry->proc_fops = &proc_sysrq_trigger_operations; |
623 |
#endif |
#endif |
624 |
+ /***** CCS start. *****/ |
+ printk(KERN_INFO "Hook version: 2.6.15-55.87 2010/08/23\n"); |
|
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO) |
|
|
+ printk(KERN_INFO "Hook version: 2.6.15-53.75 2009/03/18\n"); |
|
|
+#endif |
|
|
+ /***** CCS end. *****/ |
|
625 |
} |
} |
626 |
--- linux-2.6.15-53.75.orig/include/linux/init_task.h |
--- linux-2.6.15-55.87.orig/include/linux/init_task.h |
627 |
+++ linux-2.6.15-53.75/include/linux/init_task.h |
+++ linux-2.6.15-55.87/include/linux/init_task.h |
628 |
@@ -121,6 +121,10 @@ extern struct group_info init_groups; |
@@ -72,6 +72,14 @@ |
629 |
|
|
630 |
|
extern struct group_info init_groups; |
631 |
|
|
632 |
|
+#ifdef CONFIG_CCSECURITY |
633 |
|
+#define INIT_CCSECURITY \ |
634 |
|
+ .ccs_domain_info = NULL, \ |
635 |
|
+ .ccs_flags = 0, |
636 |
|
+#else |
637 |
|
+#define INIT_CCSECURITY |
638 |
|
+#endif |
639 |
|
+ |
640 |
|
/* |
641 |
|
* INIT_TASK is used to set up the first task table, touch at |
642 |
|
* your own risk!. Base=0, limit=0x1fffff (=2MB) |
643 |
|
@@ -121,6 +129,7 @@ extern struct group_info init_groups; |
644 |
.journal_info = NULL, \ |
.journal_info = NULL, \ |
645 |
.cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ |
.cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ |
646 |
.fs_excl = ATOMIC_INIT(0), \ |
.fs_excl = ATOMIC_INIT(0), \ |
647 |
+ /***** TOMOYO Linux start. *****/ \ |
+ INIT_CCSECURITY \ |
|
+ .ccs_domain_info = NULL, \ |
|
|
+ .ccs_flags = 0, \ |
|
|
+ /***** TOMOYO Linux end. *****/ \ |
|
648 |
} |
} |
649 |
|
|
650 |
|
|
651 |
--- linux-2.6.15-53.75.orig/include/linux/sched.h |
--- linux-2.6.15-55.87.orig/include/linux/sched.h |
652 |
+++ linux-2.6.15-53.75/include/linux/sched.h |
+++ linux-2.6.15-55.87/include/linux/sched.h |
653 |
@@ -39,6 +39,10 @@ |
@@ -165,6 +165,8 @@ struct sched_param { |
654 |
|
|
655 |
struct exec_domain; |
#ifdef __KERNEL__ |
656 |
|
|
|
+/***** TOMOYO Linux start. *****/ |
|
657 |
+struct ccs_domain_info; |
+struct ccs_domain_info; |
|
+/***** TOMOYO Linux end. *****/ |
|
658 |
+ |
+ |
659 |
|
#include <linux/spinlock.h> |
660 |
|
|
661 |
/* |
/* |
662 |
* cloning flags: |
@@ -858,6 +860,10 @@ struct task_struct { |
|
*/ |
|
|
@@ -858,6 +862,10 @@ struct task_struct { |
|
663 |
#endif |
#endif |
664 |
atomic_t fs_excl; /* holding fs exclusive resources */ |
atomic_t fs_excl; /* holding fs exclusive resources */ |
665 |
struct list_head *scm_work_list; |
struct list_head *scm_work_list; |
666 |
+ /***** TOMOYO Linux start. *****/ |
+#ifdef CONFIG_CCSECURITY |
667 |
+ struct ccs_domain_info *ccs_domain_info; |
+ struct ccs_domain_info *ccs_domain_info; |
668 |
+ u32 ccs_flags; |
+ u32 ccs_flags; |
669 |
+ /***** TOMOYO Linux end. *****/ |
+#endif |
670 |
}; |
}; |
671 |
|
|
672 |
static inline pid_t process_group(struct task_struct *tsk) |
static inline pid_t process_group(struct task_struct *tsk) |
673 |
--- linux-2.6.15-53.75.orig/kernel/compat.c |
--- linux-2.6.15-55.87.orig/kernel/compat.c |
674 |
+++ linux-2.6.15-53.75/kernel/compat.c |
+++ linux-2.6.15-55.87/kernel/compat.c |
675 |
@@ -24,6 +24,9 @@ |
@@ -24,6 +24,7 @@ |
676 |
|
|
677 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
678 |
#include <asm/bug.h> |
#include <asm/bug.h> |
679 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
680 |
|
|
681 |
int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts) |
int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts) |
682 |
{ |
{ |
683 |
@@ -849,6 +852,10 @@ asmlinkage long compat_sys_stime(compat_ |
@@ -849,6 +850,8 @@ asmlinkage long compat_sys_stime(compat_ |
684 |
err = security_settime(&tv, NULL); |
err = security_settime(&tv, NULL); |
685 |
if (err) |
if (err) |
686 |
return err; |
return err; |
|
+ /***** TOMOYO Linux start. *****/ |
|
687 |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
688 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
689 |
|
|
690 |
do_settimeofday(&tv); |
do_settimeofday(&tv); |
691 |
return 0; |
return 0; |
692 |
--- linux-2.6.15-53.75.orig/kernel/kexec.c |
--- linux-2.6.15-55.87.orig/kernel/kexec.c |
693 |
+++ linux-2.6.15-53.75/kernel/kexec.c |
+++ linux-2.6.15-55.87/kernel/kexec.c |
694 |
@@ -25,6 +25,9 @@ |
@@ -25,6 +25,7 @@ |
695 |
#include <asm/io.h> |
#include <asm/io.h> |
696 |
#include <asm/system.h> |
#include <asm/system.h> |
697 |
#include <asm/semaphore.h> |
#include <asm/semaphore.h> |
698 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
699 |
|
|
700 |
/* Location of the reserved area for the crash kernel */ |
/* Location of the reserved area for the crash kernel */ |
701 |
struct resource crashk_res = { |
struct resource crashk_res = { |
702 |
@@ -918,6 +921,10 @@ asmlinkage long sys_kexec_load(unsigned |
@@ -917,6 +918,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon |
703 |
/* We only trust the superuser with rebooting the system. */ |
/* We only trust the superuser with rebooting the system. */ |
704 |
if (!capable(CAP_SYS_BOOT)) |
if (!capable(CAP_SYS_BOOT)) |
705 |
return -EPERM; |
return -EPERM; |
|
+ /***** TOMOYO Linux start. *****/ |
|
706 |
+ if (!ccs_capable(CCS_SYS_KEXEC_LOAD)) |
+ if (!ccs_capable(CCS_SYS_KEXEC_LOAD)) |
707 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
708 |
|
|
709 |
/* |
/* |
710 |
* Verify we have a legal set of flags |
* Verify we have a legal set of flags |
711 |
--- linux-2.6.15-53.75.orig/kernel/kmod.c |
--- linux-2.6.15-55.87.orig/kernel/kmod.c |
712 |
+++ linux-2.6.15-53.75/kernel/kmod.c |
+++ linux-2.6.15-55.87/kernel/kmod.c |
713 |
@@ -149,6 +149,11 @@ static int ____call_usermodehelper(void |
@@ -149,6 +149,11 @@ static int ____call_usermodehelper(void |
714 |
/* We can run anywhere, unlike our parent keventd(). */ |
/* We can run anywhere, unlike our parent keventd(). */ |
715 |
set_cpus_allowed(current, CPU_MASK_ALL); |
set_cpus_allowed(current, CPU_MASK_ALL); |
716 |
|
|
717 |
+ /***** TOMOYO Linux start. *****/ |
+#ifdef CONFIG_CCSECURITY |
718 |
+ current->ccs_domain_info = NULL; |
+ current->ccs_domain_info = NULL; |
719 |
+ current->ccs_flags = 0; |
+ current->ccs_flags = 0; |
720 |
+ /***** TOMOYO Linux end. *****/ |
+#endif |
721 |
+ |
+ |
722 |
retval = -EPERM; |
retval = -EPERM; |
723 |
if (current->fs->root) |
if (current->fs->root) |
724 |
retval = execve(sub_info->path, sub_info->argv,sub_info->envp); |
retval = execve(sub_info->path, sub_info->argv,sub_info->envp); |
725 |
--- linux-2.6.15-53.75.orig/kernel/module.c |
--- linux-2.6.15-55.87.orig/kernel/module.c |
726 |
+++ linux-2.6.15-53.75/kernel/module.c |
+++ linux-2.6.15-55.87/kernel/module.c |
727 |
@@ -41,6 +41,9 @@ |
@@ -41,6 +41,7 @@ |
728 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
729 |
#include <asm/semaphore.h> |
#include <asm/semaphore.h> |
730 |
#include <asm/cacheflush.h> |
#include <asm/cacheflush.h> |
731 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
732 |
|
|
733 |
#if 0 |
#if 0 |
734 |
#define DEBUGP printk |
#define DEBUGP printk |
735 |
@@ -577,7 +580,10 @@ sys_delete_module(const char __user *nam |
@@ -577,7 +578,8 @@ SYSCALL_DEFINE2(delete_module, const cha |
736 |
|
|
737 |
if (!capable(CAP_SYS_MODULE)) |
if (!capable(CAP_SYS_MODULE)) |
738 |
return -EPERM; |
return -EPERM; |
739 |
- |
- |
|
+ /***** TOMOYO Linux start. *****/ |
|
740 |
+ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) |
+ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) |
741 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
742 |
if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
743 |
return -EFAULT; |
return -EFAULT; |
744 |
name[MODULE_NAME_LEN-1] = '\0'; |
name[MODULE_NAME_LEN-1] = '\0'; |
745 |
@@ -1886,7 +1892,10 @@ sys_init_module(void __user *umod, |
@@ -1884,7 +1886,8 @@ SYSCALL_DEFINE3(init_module, void __user |
746 |
/* Must have permission */ |
/* Must have permission */ |
747 |
if (!capable(CAP_SYS_MODULE)) |
if (!capable(CAP_SYS_MODULE)) |
748 |
return -EPERM; |
return -EPERM; |
749 |
- |
- |
|
+ /***** TOMOYO Linux start. *****/ |
|
750 |
+ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) |
+ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) |
751 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
752 |
/* Only one module load at a time, please */ |
/* Only one module load at a time, please */ |
753 |
if (down_interruptible(&module_mutex) != 0) |
if (down_interruptible(&module_mutex) != 0) |
754 |
return -EINTR; |
return -EINTR; |
755 |
--- linux-2.6.15-53.75.orig/kernel/ptrace.c |
--- linux-2.6.15-55.87.orig/kernel/ptrace.c |
756 |
+++ linux-2.6.15-53.75/kernel/ptrace.c |
+++ linux-2.6.15-55.87/kernel/ptrace.c |
757 |
@@ -20,6 +20,9 @@ |
@@ -21,6 +21,7 @@ |
758 |
|
|
759 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
760 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
761 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
762 |
|
|
763 |
/* |
/* |
764 |
* ptrace a task: make the debugger its new parent and |
* ptrace a task: make the debugger its new parent and |
765 |
@@ -492,6 +495,10 @@ asmlinkage long sys_ptrace(long request, |
@@ -493,6 +494,8 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
766 |
/* |
/* |
767 |
* This lock_kernel fixes a subtle race with suid exec |
* This lock_kernel fixes a subtle race with suid exec |
768 |
*/ |
*/ |
769 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_ptrace_permission(request, pid)) |
|
+ if (!ccs_capable(CCS_SYS_PTRACE)) |
|
770 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
771 |
lock_kernel(); |
lock_kernel(); |
772 |
ret = ptrace_get_task_struct(request, pid, &child); |
ret = ptrace_get_task_struct(request, pid, &child); |
773 |
if (!child) |
if (!child) |
774 |
--- linux-2.6.15-53.75.orig/kernel/sched.c |
--- linux-2.6.15-55.87.orig/kernel/sched.c |
775 |
+++ linux-2.6.15-53.75/kernel/sched.c |
+++ linux-2.6.15-55.87/kernel/sched.c |
776 |
@@ -50,6 +50,9 @@ |
@@ -50,6 +50,7 @@ |
777 |
#include <asm/tlb.h> |
#include <asm/tlb.h> |
778 |
|
|
779 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
780 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
781 |
|
|
782 |
/* |
/* |
783 |
* Convert user-nice values [ -20 ... 0 ... 19 ] |
* Convert user-nice values [ -20 ... 0 ... 19 ] |
784 |
@@ -3603,6 +3606,10 @@ asmlinkage long sys_nice(int increment) |
@@ -3603,6 +3604,8 @@ SYSCALL_DEFINE1(nice, int, increment) |
785 |
{ |
{ |
786 |
int retval; |
int retval; |
787 |
long nice; |
long nice; |
|
+ /***** TOMOYO Linux start. *****/ |
|
788 |
+ if (!ccs_capable(CCS_SYS_NICE)) |
+ if (!ccs_capable(CCS_SYS_NICE)) |
789 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
790 |
|
|
791 |
/* |
/* |
792 |
* Setpriority might change our priority at the same moment. |
* Setpriority might change our priority at the same moment. |
793 |
--- linux-2.6.15-53.75.orig/kernel/signal.c |
--- linux-2.6.15-55.87.orig/kernel/signal.c |
794 |
+++ linux-2.6.15-53.75/kernel/signal.c |
+++ linux-2.6.15-55.87/kernel/signal.c |
795 |
@@ -29,6 +29,9 @@ |
@@ -29,6 +29,7 @@ |
796 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
797 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
798 |
#include <asm/siginfo.h> |
#include <asm/siginfo.h> |
799 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
800 |
|
|
801 |
/* |
/* |
802 |
* SLAB caches for signal bits. |
* SLAB caches for signal bits. |
803 |
@@ -2241,6 +2244,12 @@ asmlinkage long |
@@ -2237,6 +2238,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
804 |
sys_kill(int pid, int sig) |
SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
805 |
{ |
{ |
806 |
struct siginfo info; |
struct siginfo info; |
807 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_kill_permission(pid, sig)) |
|
+ if (sig && !ccs_capable(CCS_SYS_KILL)) |
|
|
+ return -EPERM; |
|
|
+ if (sig && ccs_check_signal_acl(sig, pid)) |
|
808 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
809 |
|
|
810 |
info.si_signo = sig; |
info.si_signo = sig; |
811 |
info.si_errno = 0; |
info.si_errno = 0; |
812 |
@@ -2299,6 +2308,12 @@ asmlinkage long sys_tgkill(int tgid, int |
@@ -2295,6 +2298,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid |
813 |
/* This is only valid for single tasks */ |
/* This is only valid for single tasks */ |
814 |
if (pid <= 0 || tgid <= 0) |
if (pid <= 0 || tgid <= 0) |
815 |
return -EINVAL; |
return -EINVAL; |
816 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_tgkill_permission(tgid, pid, sig)) |
|
+ if (sig && !ccs_capable(CCS_SYS_KILL)) |
|
817 |
+ return -EPERM; |
+ return -EPERM; |
|
+ if (sig && ccs_check_signal_acl(sig, pid)) |
|
|
+ return -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
818 |
|
|
819 |
return do_tkill(tgid, pid, sig); |
return do_tkill(tgid, pid, sig); |
820 |
} |
} |
821 |
@@ -2312,6 +2327,12 @@ sys_tkill(int pid, int sig) |
@@ -2307,6 +2312,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, |
822 |
/* This is only valid for single tasks */ |
/* This is only valid for single tasks */ |
823 |
if (pid <= 0) |
if (pid <= 0) |
824 |
return -EINVAL; |
return -EINVAL; |
825 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_tkill_permission(pid, sig)) |
|
+ if (sig && !ccs_capable(CCS_SYS_KILL)) |
|
|
+ return -EPERM; |
|
|
+ if (sig && ccs_check_signal_acl(sig, pid)) |
|
826 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
827 |
|
|
828 |
return do_tkill(0, pid, sig); |
return do_tkill(0, pid, sig); |
829 |
} |
} |
830 |
--- linux-2.6.15-53.75.orig/kernel/sys.c |
@@ -2324,6 +2331,8 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, |
831 |
+++ linux-2.6.15-53.75/kernel/sys.c |
if (info.si_code >= 0) |
832 |
@@ -37,6 +37,9 @@ |
return -EPERM; |
833 |
|
info.si_signo = sig; |
834 |
|
+ if (ccs_sigqueue_permission(pid, sig)) |
835 |
|
+ return -EPERM; |
836 |
|
|
837 |
|
/* POSIX.1b doesn't mention process groups. */ |
838 |
|
return kill_proc_info(sig, &info, pid); |
839 |
|
--- linux-2.6.15-55.87.orig/kernel/sys.c |
840 |
|
+++ linux-2.6.15-55.87/kernel/sys.c |
841 |
|
@@ -37,6 +37,7 @@ |
842 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
843 |
#include <asm/io.h> |
#include <asm/io.h> |
844 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
845 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
846 |
|
|
847 |
#ifndef SET_UNALIGN_CTL |
#ifndef SET_UNALIGN_CTL |
848 |
# define SET_UNALIGN_CTL(a,b) (-EINVAL) |
# define SET_UNALIGN_CTL(a,b) (-EINVAL) |
849 |
@@ -256,6 +259,12 @@ asmlinkage long sys_setpriority(int whic |
@@ -256,6 +257,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
850 |
|
|
851 |
if (which > 2 || which < 0) |
if (which > 2 || which < 0) |
852 |
goto out; |
goto out; |
|
+ /***** TOMOYO Linux start. *****/ |
|
853 |
+ if (!ccs_capable(CCS_SYS_NICE)) { |
+ if (!ccs_capable(CCS_SYS_NICE)) { |
854 |
+ error = -EPERM; |
+ error = -EPERM; |
855 |
+ goto out; |
+ goto out; |
856 |
+ } |
+ } |
|
+ /***** TOMOYO Linux end. *****/ |
|
857 |
|
|
858 |
/* normalize: avoid signed division (rounding problems) */ |
/* normalize: avoid signed division (rounding problems) */ |
859 |
error = -ESRCH; |
error = -ESRCH; |
860 |
@@ -483,6 +492,10 @@ asmlinkage long sys_reboot(int magic1, i |
@@ -484,6 +489,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int |
861 |
magic2 != LINUX_REBOOT_MAGIC2B && |
magic2 != LINUX_REBOOT_MAGIC2B && |
862 |
magic2 != LINUX_REBOOT_MAGIC2C)) |
magic2 != LINUX_REBOOT_MAGIC2C)) |
863 |
return -EINVAL; |
return -EINVAL; |
|
+ /***** TOMOYO Linux start. *****/ |
|
864 |
+ if (!ccs_capable(CCS_SYS_REBOOT)) |
+ if (!ccs_capable(CCS_SYS_REBOOT)) |
865 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
866 |
|
|
867 |
lock_kernel(); |
lock_kernel(); |
868 |
switch (cmd) { |
switch (cmd) { |
869 |
@@ -1515,6 +1528,10 @@ asmlinkage long sys_sethostname(char __u |
@@ -1518,6 +1525,8 @@ SYSCALL_DEFINE2(sethostname, char __user |
870 |
return -EPERM; |
return -EPERM; |
871 |
if (len < 0 || len > __NEW_UTS_LEN) |
if (len < 0 || len > __NEW_UTS_LEN) |
872 |
return -EINVAL; |
return -EINVAL; |
|
+ /***** TOMOYO Linux start. *****/ |
|
873 |
+ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) |
+ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) |
874 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
875 |
down_write(&uts_sem); |
down_write(&uts_sem); |
876 |
errno = -EFAULT; |
errno = -EFAULT; |
877 |
if (!copy_from_user(tmp, name, len)) { |
if (!copy_from_user(tmp, name, len)) { |
878 |
@@ -1560,6 +1577,10 @@ asmlinkage long sys_setdomainname(char _ |
@@ -1563,6 +1572,8 @@ SYSCALL_DEFINE2(setdomainname, char __us |
879 |
return -EPERM; |
return -EPERM; |
880 |
if (len < 0 || len > __NEW_UTS_LEN) |
if (len < 0 || len > __NEW_UTS_LEN) |
881 |
return -EINVAL; |
return -EINVAL; |
|
+ /***** TOMOYO Linux start. *****/ |
|
882 |
+ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) |
+ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) |
883 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
884 |
|
|
885 |
down_write(&uts_sem); |
down_write(&uts_sem); |
886 |
errno = -EFAULT; |
errno = -EFAULT; |
887 |
--- linux-2.6.15-53.75.orig/kernel/sysctl.c |
--- linux-2.6.15-55.87.orig/kernel/sysctl.c |
888 |
+++ linux-2.6.15-53.75/kernel/sysctl.c |
+++ linux-2.6.15-55.87/kernel/sysctl.c |
889 |
@@ -45,6 +45,9 @@ |
@@ -45,6 +45,7 @@ |
890 |
|
|
891 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
892 |
#include <asm/processor.h> |
#include <asm/processor.h> |
893 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
894 |
|
|
895 |
#ifdef CONFIG_ROOT_NFS |
#ifdef CONFIG_ROOT_NFS |
896 |
#include <linux/nfs_fs.h> |
#include <linux/nfs_fs.h> |
897 |
@@ -1041,6 +1044,100 @@ void __init sysctl_init(void) |
@@ -1066,6 +1067,9 @@ int do_sysctl(int __user *name, int nlen |
|
#endif |
|
|
} |
|
|
|
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+static int try_parse_table(int __user *name, int nlen, void __user *oldval, |
|
|
+ void __user *newval, ctl_table *table) |
|
|
+{ |
|
|
+ int n; |
|
|
+ int error = -ENOMEM; |
|
|
+ int op = 0; |
|
|
+ char *buffer = kmalloc(PAGE_SIZE, GFP_KERNEL); |
|
|
+ if (oldval) |
|
|
+ op |= 004; |
|
|
+ if (newval) |
|
|
+ op |= 002; |
|
|
+ if (!op) { /* Neither read nor write */ |
|
|
+ error = 0; |
|
|
+ goto out; |
|
|
+ } |
|
|
+ if (!buffer) |
|
|
+ goto out; |
|
|
+ memset(buffer, 0, PAGE_SIZE); |
|
|
+ snprintf(buffer, PAGE_SIZE - 1, "/proc/sys"); |
|
|
+ repeat: |
|
|
+ if (!nlen) { |
|
|
+ error = -ENOTDIR; |
|
|
+ goto out; |
|
|
+ } |
|
|
+ if (get_user(n, name)) { |
|
|
+ error = -EFAULT; |
|
|
+ goto out; |
|
|
+ } |
|
|
+ for ( ; table->ctl_name; table++) { |
|
|
+ if (n == table->ctl_name || table->ctl_name == CTL_ANY) { |
|
|
+ int pos = strlen(buffer); |
|
|
+ const char *cp = table->procname; |
|
|
+ error = -ENOMEM; |
|
|
+ if (cp) { |
|
|
+ if (pos + 1 >= PAGE_SIZE - 1) |
|
|
+ goto out; |
|
|
+ buffer[pos++] = '/'; |
|
|
+ while (*cp) { |
|
|
+ const unsigned char c |
|
|
+ = *(const unsigned char *) cp; |
|
|
+ if (c == '\\') { |
|
|
+ if (pos + 2 >= PAGE_SIZE - 1) |
|
|
+ goto out; |
|
|
+ buffer[pos++] = '\\'; |
|
|
+ buffer[pos++] = '\\'; |
|
|
+ } else if (c > ' ' && c < 127) { |
|
|
+ if (pos + 1 >= PAGE_SIZE - 1) |
|
|
+ goto out; |
|
|
+ buffer[pos++] = c; |
|
|
+ } else { |
|
|
+ if (pos + 4 >= PAGE_SIZE - 1) |
|
|
+ goto out; |
|
|
+ buffer[pos++] = '\\'; |
|
|
+ buffer[pos++] = (c >> 6) + '0'; |
|
|
+ buffer[pos++] = ((c >> 3) & 7) |
|
|
+ + '0'; |
|
|
+ buffer[pos++] = (c & 7) + '0'; |
|
|
+ } |
|
|
+ cp++; |
|
|
+ } |
|
|
+ } else { |
|
|
+ /* Assume nobody assigns "=\$=" for procname. */ |
|
|
+ snprintf(buffer + pos, PAGE_SIZE - pos - 1, |
|
|
+ "/=%d=", table->ctl_name); |
|
|
+ if (!memchr(buffer, '\0', PAGE_SIZE - 2)) |
|
|
+ goto out; |
|
|
+ } |
|
|
+ if (table->child) { |
|
|
+ if (table->strategy) { |
|
|
+ /* printk("sysctl='%s'\n", buffer); */ |
|
|
+ if (ccs_check_file_perm(buffer, op, |
|
|
+ "sysctl")) { |
|
|
+ error = -EPERM; |
|
|
+ goto out; |
|
|
+ } |
|
|
+ } |
|
|
+ name++; |
|
|
+ nlen--; |
|
|
+ table = table->child; |
|
|
+ goto repeat; |
|
|
+ } |
|
|
+ /* printk("sysctl='%s'\n", buffer); */ |
|
|
+ error = ccs_check_file_perm(buffer, op, "sysctl"); |
|
|
+ goto out; |
|
|
+ } |
|
|
+ } |
|
|
+ error = -ENOTDIR; |
|
|
+ out: |
|
|
+ kfree(buffer); |
|
|
+ return error; |
|
|
+} |
|
|
+/***** TOMOYO Linux end. *****/ |
|
|
+ |
|
|
int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp, |
|
|
void __user *newval, size_t newlen) |
|
|
{ |
|
|
@@ -1066,6 +1163,11 @@ int do_sysctl(int __user *name, int nlen |
|
898 |
|
|
899 |
spin_unlock(&sysctl_lock); |
spin_unlock(&sysctl_lock); |
900 |
|
|
901 |
+ /***** TOMOYO Linux start. *****/ |
+ error = ccs_parse_table(name, nlen, oldval, newval, |
|
+ error = try_parse_table(name, nlen, oldval, newval, |
|
902 |
+ head->ctl_table); |
+ head->ctl_table); |
903 |
+ if (!error) |
+ if (!error) |
|
+ /***** TOMOYO Linux end. *****/ |
|
904 |
error = parse_table(name, nlen, oldval, oldlenp, |
error = parse_table(name, nlen, oldval, oldlenp, |
905 |
newval, newlen, head->ctl_table, |
newval, newlen, head->ctl_table, |
906 |
&context); |
&context); |
907 |
@@ -1138,6 +1240,15 @@ repeat: |
@@ -1138,6 +1142,13 @@ repeat: |
908 |
if (ctl_perm(table, 001)) |
if (ctl_perm(table, 001)) |
909 |
return -EPERM; |
return -EPERM; |
910 |
if (table->strategy) { |
if (table->strategy) { |
|
+ /***** TOMOYO Linux start. *****/ |
|
911 |
+ int op = 0; |
+ int op = 0; |
912 |
+ if (oldval) |
+ if (oldval) |
913 |
+ op |= 004; |
+ op |= 004; |
915 |
+ op |= 002; |
+ op |= 002; |
916 |
+ if (ctl_perm(table, op)) |
+ if (ctl_perm(table, op)) |
917 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
918 |
error = table->strategy( |
error = table->strategy( |
919 |
table, name, nlen, |
table, name, nlen, |
920 |
oldval, oldlenp, |
oldval, oldlenp, |
921 |
--- linux-2.6.15-53.75.orig/kernel/time.c |
--- linux-2.6.15-55.87.orig/kernel/time.c |
922 |
+++ linux-2.6.15-53.75/kernel/time.c |
+++ linux-2.6.15-55.87/kernel/time.c |
923 |
@@ -38,6 +38,9 @@ |
@@ -38,6 +38,7 @@ |
924 |
|
|
925 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
926 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
927 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
928 |
|
|
929 |
/* |
/* |
930 |
* The timezone where the local system is located. Used as a default by some |
* The timezone where the local system is located. Used as a default by some |
931 |
@@ -90,6 +93,10 @@ asmlinkage long sys_stime(time_t __user |
@@ -90,6 +91,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, |
932 |
err = security_settime(&tv, NULL); |
err = security_settime(&tv, NULL); |
933 |
if (err) |
if (err) |
934 |
return err; |
return err; |
|
+ /***** TOMOYO Linux start. *****/ |
|
935 |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
936 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
937 |
|
|
938 |
do_settimeofday(&tv); |
do_settimeofday(&tv); |
939 |
return 0; |
return 0; |
940 |
@@ -157,6 +164,10 @@ int do_sys_settimeofday(struct timespec |
@@ -158,6 +161,8 @@ int do_sys_settimeofday(struct timespec |
941 |
error = security_settime(tv, tz); |
error = security_settime(tv, tz); |
942 |
if (error) |
if (error) |
943 |
return error; |
return error; |
|
+ /***** TOMOYO Linux start. *****/ |
|
944 |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
+ if (!ccs_capable(CCS_SYS_SETTIME)) |
945 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
946 |
|
|
947 |
if (tz) { |
if (tz) { |
948 |
/* SMP safe, global irq locking makes it work. */ |
/* SMP safe, global irq locking makes it work. */ |
949 |
@@ -235,6 +246,10 @@ int do_adjtimex(struct timex *txc) |
@@ -236,6 +241,8 @@ int do_adjtimex(struct timex *txc) |
950 |
/* In order to modify anything, you gotta be super-user! */ |
/* In order to modify anything, you gotta be super-user! */ |
951 |
if (txc->modes && !capable(CAP_SYS_TIME)) |
if (txc->modes && !capable(CAP_SYS_TIME)) |
952 |
return -EPERM; |
return -EPERM; |
|
+ /***** TOMOYO Linux start. *****/ |
|
953 |
+ if (txc->modes && !ccs_capable(CCS_SYS_SETTIME)) |
+ if (txc->modes && !ccs_capable(CCS_SYS_SETTIME)) |
954 |
+ return -EPERM; |
+ return -EPERM; |
|
+ /***** TOMOYO Linux end. *****/ |
|
955 |
|
|
956 |
/* Now we validate the data before disabling interrupts */ |
/* Now we validate the data before disabling interrupts */ |
957 |
|
|
958 |
--- linux-2.6.15-53.75.orig/net/core/datagram.c |
--- linux-2.6.15-55.87.orig/net/ipv4/inet_connection_sock.c |
959 |
+++ linux-2.6.15-53.75/net/core/datagram.c |
+++ linux-2.6.15-55.87/net/ipv4/inet_connection_sock.c |
960 |
@@ -55,6 +55,11 @@ |
@@ -24,6 +24,7 @@ |
|
#include <net/sock.h> |
|
|
#include <net/tcp_states.h> |
|
|
|
|
|
+/***** TOMOYO Linux start. *****/ |
|
|
+#include <linux/tomoyo.h> |
|
|
+#include <linux/tomoyo_socket.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
|
+ |
|
|
/* |
|
|
* Is a socket 'connection oriented' ? |
|
|
*/ |
|
|
@@ -177,6 +182,12 @@ struct sk_buff *skb_recv_datagram(struct |
|
|
} else |
|
|
skb = skb_dequeue(&sk->sk_receive_queue); |
|
|
|
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ error = ccs_socket_recv_datagram_permission(sk, skb, flags); |
|
|
+ if (error) |
|
|
+ goto no_packet; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
+ |
|
|
if (skb) |
|
|
return skb; |
|
|
|
|
|
--- linux-2.6.15-53.75.orig/net/ipv4/inet_connection_sock.c |
|
|
+++ linux-2.6.15-53.75/net/ipv4/inet_connection_sock.c |
|
|
@@ -24,6 +24,9 @@ |
|
961 |
#include <net/route.h> |
#include <net/route.h> |
962 |
#include <net/tcp_states.h> |
#include <net/tcp_states.h> |
963 |
#include <net/xfrm.h> |
#include <net/xfrm.h> |
964 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
965 |
|
|
966 |
#ifdef INET_CSK_DEBUG |
#ifdef INET_CSK_DEBUG |
967 |
const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n"; |
const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n"; |
968 |
@@ -83,6 +86,10 @@ int inet_csk_get_port(struct inet_hashin |
@@ -83,6 +84,8 @@ int inet_csk_get_port(struct inet_hashin |
969 |
do { |
do { |
970 |
head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)]; |
head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)]; |
971 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
972 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(rover)) |
|
+ if (ccs_may_autobind(rover)) |
|
973 |
+ goto next; |
+ goto next; |
|
+ /***** SAKURA Linux end. *****/ |
|
974 |
inet_bind_bucket_for_each(tb, node, &head->chain) |
inet_bind_bucket_for_each(tb, node, &head->chain) |
975 |
if (tb->port == rover) |
if (tb->port == rover) |
976 |
goto next; |
goto next; |
977 |
--- linux-2.6.15-53.75.orig/net/ipv4/tcp_ipv4.c |
--- linux-2.6.15-55.87.orig/net/ipv4/raw.c |
978 |
+++ linux-2.6.15-53.75/net/ipv4/tcp_ipv4.c |
+++ linux-2.6.15-55.87/net/ipv4/raw.c |
979 |
@@ -76,6 +76,9 @@ |
@@ -79,6 +79,7 @@ |
980 |
|
#include <linux/seq_file.h> |
981 |
|
#include <linux/netfilter.h> |
982 |
|
#include <linux/netfilter_ipv4.h> |
983 |
|
+#include <linux/ccsecurity.h> |
984 |
|
|
985 |
|
struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE]; |
986 |
|
DEFINE_RWLOCK(raw_v4_lock); |
987 |
|
@@ -588,9 +589,14 @@ static int raw_recvmsg(struct kiocb *ioc |
988 |
|
goto out; |
989 |
|
} |
990 |
|
|
991 |
|
- skb = skb_recv_datagram(sk, flags, noblock, &err); |
992 |
|
- if (!skb) |
993 |
|
- goto out; |
994 |
|
+ for (;;) { |
995 |
|
+ skb = skb_recv_datagram(sk, flags, noblock, &err); |
996 |
|
+ if (!skb) |
997 |
|
+ goto out; |
998 |
|
+ if (!ccs_socket_post_recvmsg_permission(sk, skb)) |
999 |
|
+ break; |
1000 |
|
+ skb_kill_datagram(sk, skb, flags); |
1001 |
|
+ } |
1002 |
|
|
1003 |
|
copied = skb->len; |
1004 |
|
if (len < copied) { |
1005 |
|
--- linux-2.6.15-55.87.orig/net/ipv4/tcp_ipv4.c |
1006 |
|
+++ linux-2.6.15-55.87/net/ipv4/tcp_ipv4.c |
1007 |
|
@@ -76,6 +76,7 @@ |
1008 |
#include <linux/stddef.h> |
#include <linux/stddef.h> |
1009 |
#include <linux/proc_fs.h> |
#include <linux/proc_fs.h> |
1010 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1011 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
1012 |
|
|
1013 |
int sysctl_tcp_tw_reuse; |
int sysctl_tcp_tw_reuse; |
1014 |
int sysctl_tcp_low_latency; |
int sysctl_tcp_low_latency; |
1015 |
@@ -243,6 +246,10 @@ static inline int tcp_v4_hash_connect(st |
@@ -243,6 +244,8 @@ static inline int tcp_v4_hash_connect(st |
1016 |
local_bh_disable(); |
local_bh_disable(); |
1017 |
for (i = 1; i <= range; i++) { |
for (i = 1; i <= range; i++) { |
1018 |
port = low + (i + offset) % range; |
port = low + (i + offset) % range; |
1019 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(port)) |
|
+ if (ccs_may_autobind(port)) |
|
1020 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1021 |
head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)]; |
head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)]; |
1022 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
1023 |
|
|
1024 |
--- linux-2.6.15-53.75.orig/net/ipv4/udp.c |
--- linux-2.6.15-55.87.orig/net/ipv4/udp.c |
1025 |
+++ linux-2.6.15-53.75/net/ipv4/udp.c |
+++ linux-2.6.15-55.87/net/ipv4/udp.c |
1026 |
@@ -108,6 +108,9 @@ |
@@ -108,6 +108,7 @@ |
1027 |
#include <net/inet_common.h> |
#include <net/inet_common.h> |
1028 |
#include <net/checksum.h> |
#include <net/checksum.h> |
1029 |
#include <net/xfrm.h> |
#include <net/xfrm.h> |
1030 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
1031 |
|
|
1032 |
/* |
/* |
1033 |
* Snmp MIB for the UDP layer |
* Snmp MIB for the UDP layer |
1034 |
@@ -146,6 +149,10 @@ static int udp_v4_get_port(struct sock * |
@@ -146,6 +147,8 @@ static int udp_v4_get_port(struct sock * |
1035 |
result = sysctl_local_port_range[0] + |
result = sysctl_local_port_range[0] + |
1036 |
((result - sysctl_local_port_range[0]) & |
((result - sysctl_local_port_range[0]) & |
1037 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1038 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(result)) |
|
+ if (ccs_may_autobind(result)) |
|
1039 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1040 |
goto gotit; |
goto gotit; |
1041 |
} |
} |
1042 |
size = 0; |
size = 0; |
1043 |
@@ -162,6 +169,10 @@ static int udp_v4_get_port(struct sock * |
@@ -162,6 +165,8 @@ static int udp_v4_get_port(struct sock * |
1044 |
result = sysctl_local_port_range[0] |
result = sysctl_local_port_range[0] |
1045 |
+ ((result - sysctl_local_port_range[0]) & |
+ ((result - sysctl_local_port_range[0]) & |
1046 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1047 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(result)) |
|
+ if (ccs_may_autobind(result)) |
|
1048 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1049 |
if (!udp_lport_inuse(result)) |
if (!udp_lport_inuse(result)) |
1050 |
break; |
break; |
1051 |
} |
} |
1052 |
--- linux-2.6.15-53.75.orig/net/ipv6/tcp_ipv6.c |
@@ -784,6 +789,7 @@ static int udp_recvmsg(struct kiocb *ioc |
1053 |
+++ linux-2.6.15-53.75/net/ipv6/tcp_ipv6.c |
struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name; |
1054 |
@@ -64,6 +64,9 @@ |
struct sk_buff *skb; |
1055 |
|
int copied, err; |
1056 |
|
+ _Bool update_stat; |
1057 |
|
|
1058 |
|
/* |
1059 |
|
* Check any passed addresses |
1060 |
|
@@ -798,7 +804,12 @@ try_again: |
1061 |
|
skb = skb_recv_datagram(sk, flags, noblock, &err); |
1062 |
|
if (!skb) |
1063 |
|
goto out; |
1064 |
|
- |
1065 |
|
+ if (ccs_socket_post_recvmsg_permission(sk, skb)) { |
1066 |
|
+ update_stat = 0; |
1067 |
|
+ goto csum_copy_err; |
1068 |
|
+ } |
1069 |
|
+ update_stat = 1; |
1070 |
|
+ |
1071 |
|
copied = skb->len - sizeof(struct udphdr); |
1072 |
|
if (copied > len) { |
1073 |
|
copied = len; |
1074 |
|
@@ -846,7 +857,8 @@ out: |
1075 |
|
return err; |
1076 |
|
|
1077 |
|
csum_copy_err: |
1078 |
|
- UDP_INC_STATS_BH(UDP_MIB_INERRORS); |
1079 |
|
+ if (update_stat) |
1080 |
|
+ UDP_INC_STATS_BH(UDP_MIB_INERRORS); |
1081 |
|
|
1082 |
|
/* Clear queue. */ |
1083 |
|
if (flags&MSG_PEEK) { |
1084 |
|
--- linux-2.6.15-55.87.orig/net/ipv6/raw.c |
1085 |
|
+++ linux-2.6.15-55.87/net/ipv6/raw.c |
1086 |
|
@@ -56,6 +56,7 @@ |
1087 |
|
|
1088 |
|
#include <linux/proc_fs.h> |
1089 |
|
#include <linux/seq_file.h> |
1090 |
|
+#include <linux/ccsecurity.h> |
1091 |
|
|
1092 |
|
struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE]; |
1093 |
|
DEFINE_RWLOCK(raw_v6_lock); |
1094 |
|
@@ -384,9 +385,14 @@ static int rawv6_recvmsg(struct kiocb *i |
1095 |
|
if (flags & MSG_ERRQUEUE) |
1096 |
|
return ipv6_recv_error(sk, msg, len); |
1097 |
|
|
1098 |
|
- skb = skb_recv_datagram(sk, flags, noblock, &err); |
1099 |
|
- if (!skb) |
1100 |
|
- goto out; |
1101 |
|
+ for (;;) { |
1102 |
|
+ skb = skb_recv_datagram(sk, flags, noblock, &err); |
1103 |
|
+ if (!skb) |
1104 |
|
+ goto out; |
1105 |
|
+ if (!ccs_socket_post_recvmsg_permission(sk, skb)) |
1106 |
|
+ break; |
1107 |
|
+ skb_kill_datagram(sk, skb, flags); |
1108 |
|
+ } |
1109 |
|
|
1110 |
|
copied = skb->len; |
1111 |
|
if (copied > len) { |
1112 |
|
--- linux-2.6.15-55.87.orig/net/ipv6/tcp_ipv6.c |
1113 |
|
+++ linux-2.6.15-55.87/net/ipv6/tcp_ipv6.c |
1114 |
|
@@ -64,6 +64,7 @@ |
1115 |
|
|
1116 |
#include <linux/proc_fs.h> |
#include <linux/proc_fs.h> |
1117 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1118 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
1119 |
|
|
1120 |
static void tcp_v6_send_reset(struct sk_buff *skb); |
static void tcp_v6_send_reset(struct sk_buff *skb); |
1121 |
static void tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req); |
static void tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req); |
1122 |
@@ -119,6 +122,10 @@ static int tcp_v6_get_port(struct sock * |
@@ -119,6 +120,8 @@ static int tcp_v6_get_port(struct sock * |
1123 |
do { |
do { |
1124 |
head = &tcp_hashinfo.bhash[inet_bhashfn(rover, tcp_hashinfo.bhash_size)]; |
head = &tcp_hashinfo.bhash[inet_bhashfn(rover, tcp_hashinfo.bhash_size)]; |
1125 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
1126 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(rover)) |
|
+ if (ccs_may_autobind(rover)) |
|
1127 |
+ goto next; |
+ goto next; |
|
+ /***** SAKURA Linux end. *****/ |
|
1128 |
inet_bind_bucket_for_each(tb, node, &head->chain) |
inet_bind_bucket_for_each(tb, node, &head->chain) |
1129 |
if (tb->port == rover) |
if (tb->port == rover) |
1130 |
goto next; |
goto next; |
1131 |
@@ -419,6 +426,10 @@ static int tcp_v6_hash_connect(struct so |
@@ -419,6 +422,8 @@ static int tcp_v6_hash_connect(struct so |
1132 |
local_bh_disable(); |
local_bh_disable(); |
1133 |
for (i = 1; i <= range; i++) { |
for (i = 1; i <= range; i++) { |
1134 |
port = low + (i + offset) % range; |
port = low + (i + offset) % range; |
1135 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(port)) |
|
+ if (ccs_may_autobind(port)) |
|
1136 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1137 |
head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)]; |
head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)]; |
1138 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
1139 |
|
|
1140 |
--- linux-2.6.15-53.75.orig/net/ipv6/udp.c |
--- linux-2.6.15-55.87.orig/net/ipv6/udp.c |
1141 |
+++ linux-2.6.15-53.75/net/ipv6/udp.c |
+++ linux-2.6.15-55.87/net/ipv6/udp.c |
1142 |
@@ -58,6 +58,9 @@ |
@@ -58,6 +58,7 @@ |
1143 |
|
|
1144 |
#include <linux/proc_fs.h> |
#include <linux/proc_fs.h> |
1145 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1146 |
+/***** SAKURA Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/sakura.h> |
|
|
+/***** SAKURA Linux end. *****/ |
|
1147 |
|
|
1148 |
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly; |
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly; |
1149 |
|
|
1150 |
@@ -88,6 +91,10 @@ static int udp_v6_get_port(struct sock * |
@@ -88,6 +89,8 @@ static int udp_v6_get_port(struct sock * |
1151 |
result = sysctl_local_port_range[0] + |
result = sysctl_local_port_range[0] + |
1152 |
((result - sysctl_local_port_range[0]) & |
((result - sysctl_local_port_range[0]) & |
1153 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1154 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(result)) |
|
+ if (ccs_may_autobind(result)) |
|
1155 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1156 |
goto gotit; |
goto gotit; |
1157 |
} |
} |
1158 |
size = 0; |
size = 0; |
1159 |
@@ -104,6 +111,10 @@ static int udp_v6_get_port(struct sock * |
@@ -104,6 +107,8 @@ static int udp_v6_get_port(struct sock * |
1160 |
result = sysctl_local_port_range[0] |
result = sysctl_local_port_range[0] |
1161 |
+ ((result - sysctl_local_port_range[0]) & |
+ ((result - sysctl_local_port_range[0]) & |
1162 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1163 |
+ /***** SAKURA Linux start. *****/ |
+ if (ccs_lport_reserved(result)) |
|
+ if (ccs_may_autobind(result)) |
|
1164 |
+ continue; |
+ continue; |
|
+ /***** SAKURA Linux end. *****/ |
|
1165 |
if (!udp_lport_inuse(result)) |
if (!udp_lport_inuse(result)) |
1166 |
break; |
break; |
1167 |
} |
} |
1168 |
--- linux-2.6.15-53.75.orig/net/socket.c |
@@ -226,6 +231,7 @@ static int udpv6_recvmsg(struct kiocb *i |
1169 |
+++ linux-2.6.15-53.75/net/socket.c |
struct sk_buff *skb; |
1170 |
@@ -97,6 +97,11 @@ |
size_t copied; |
1171 |
|
int err; |
1172 |
|
+ _Bool update_stat; |
1173 |
|
|
1174 |
|
if (addr_len) |
1175 |
|
*addr_len=sizeof(struct sockaddr_in6); |
1176 |
|
@@ -237,6 +243,11 @@ try_again: |
1177 |
|
skb = skb_recv_datagram(sk, flags, noblock, &err); |
1178 |
|
if (!skb) |
1179 |
|
goto out; |
1180 |
|
+ if (ccs_socket_post_recvmsg_permission(sk, skb)) { |
1181 |
|
+ update_stat = 0; |
1182 |
|
+ goto csum_copy_err; |
1183 |
|
+ } |
1184 |
|
+ update_stat = 1; |
1185 |
|
|
1186 |
|
copied = skb->len - sizeof(struct udphdr); |
1187 |
|
if (copied > len) { |
1188 |
|
@@ -316,7 +327,8 @@ csum_copy_err: |
1189 |
|
skb_free_datagram(sk, skb); |
1190 |
|
|
1191 |
|
if (flags & MSG_DONTWAIT) { |
1192 |
|
- UDP6_INC_STATS_USER(UDP_MIB_INERRORS); |
1193 |
|
+ if (update_stat) |
1194 |
|
+ UDP6_INC_STATS_USER(UDP_MIB_INERRORS); |
1195 |
|
return -EAGAIN; |
1196 |
|
} |
1197 |
|
goto try_again; |
1198 |
|
--- linux-2.6.15-55.87.orig/net/socket.c |
1199 |
|
+++ linux-2.6.15-55.87/net/socket.c |
1200 |
|
@@ -97,6 +97,8 @@ |
1201 |
#include <net/sock.h> |
#include <net/sock.h> |
1202 |
#include <linux/netfilter.h> |
#include <linux/netfilter.h> |
1203 |
|
|
1204 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+#include <linux/tomoyo_socket.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
1205 |
+ |
+ |
1206 |
static int sock_no_open(struct inode *irrelevant, struct file *dontcare); |
static int sock_no_open(struct inode *irrelevant, struct file *dontcare); |
1207 |
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf, |
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf, |
1208 |
size_t size, loff_t pos); |
size_t size, loff_t pos); |
1209 |
@@ -546,7 +551,12 @@ static inline int __sock_sendmsg(struct |
@@ -544,9 +546,10 @@ static inline int __sock_sendmsg(struct |
1210 |
|
si->size = size; |
1211 |
|
|
1212 |
err = security_socket_sendmsg(sock, msg, size); |
err = security_socket_sendmsg(sock, msg, size); |
1213 |
|
+ if (!err) |
1214 |
|
+ err = ccs_socket_sendmsg_permission(sock, msg, size); |
1215 |
if (err) |
if (err) |
1216 |
return err; |
return err; |
1217 |
- |
- |
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ if (ccs_socket_sendmsg_permission(sock, |
|
|
+ (struct sockaddr *) msg->msg_name, |
|
|
+ msg->msg_namelen)) |
|
|
+ return -EPERM; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
1218 |
return sock->ops->sendmsg(iocb, sock, msg, size); |
return sock->ops->sendmsg(iocb, sock, msg, size); |
1219 |
} |
} |
1220 |
|
|
1221 |
@@ -1099,6 +1109,12 @@ static int __sock_create(int family, int |
@@ -1103,6 +1106,8 @@ static int __sock_create(int family, int |
|
family = PF_PACKET; |
|
1222 |
} |
} |
1223 |
|
|
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ err = ccs_socket_create_permission(family, type, protocol); |
|
|
+ if (err) |
|
|
+ return err; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
|
+ |
|
1224 |
err = security_socket_create(family, type, protocol, kern); |
err = security_socket_create(family, type, protocol, kern); |
1225 |
|
+ if (!err) |
1226 |
|
+ err = ccs_socket_create_permission(family, type, protocol); |
1227 |
if (err) |
if (err) |
1228 |
return err; |
return err; |
1229 |
@@ -1296,6 +1312,12 @@ asmlinkage long sys_bind(int fd, struct |
|
1230 |
|
@@ -1300,6 +1305,10 @@ SYSCALL_DEFINE3(bind, int, fd, struct so |
1231 |
sockfd_put(sock); |
sockfd_put(sock); |
1232 |
return err; |
return err; |
1233 |
} |
} |
|
+ /***** TOMOYO Linux start. *****/ |
|
1234 |
+ err = ccs_socket_bind_permission(sock, |
+ err = ccs_socket_bind_permission(sock, |
1235 |
+ (struct sockaddr *) |
+ (struct sockaddr *) |
1236 |
+ address, addrlen); |
+ address, addrlen); |
1237 |
+ if (!err) |
+ if (!err) |
|
+ /***** TOMOYO Linux end. *****/ |
|
1238 |
err = sock->ops->bind(sock, (struct sockaddr *)address, addrlen); |
err = sock->ops->bind(sock, (struct sockaddr *)address, addrlen); |
1239 |
} |
} |
1240 |
sockfd_put(sock); |
sockfd_put(sock); |
1241 |
@@ -1326,7 +1348,10 @@ asmlinkage long sys_listen(int fd, int b |
@@ -1330,7 +1339,8 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba |
1242 |
sockfd_put(sock); |
sockfd_put(sock); |
1243 |
return err; |
return err; |
1244 |
} |
} |
1245 |
- |
- |
|
+ /***** TOMOYO Linux start. *****/ |
|
1246 |
+ err = ccs_socket_listen_permission(sock); |
+ err = ccs_socket_listen_permission(sock); |
1247 |
+ if (!err) |
+ if (!err) |
|
+ /***** TOMOYO Linux end. *****/ |
|
1248 |
err=sock->ops->listen(sock, backlog); |
err=sock->ops->listen(sock, backlog); |
1249 |
sockfd_put(sock); |
sockfd_put(sock); |
1250 |
} |
} |
1251 |
@@ -1377,6 +1402,13 @@ asmlinkage long sys_accept(int fd, struc |
@@ -1361,6 +1371,7 @@ SYSCALL_DEFINE3(accept, int, fd, struct |
1252 |
|
if (!sock) |
1253 |
|
goto out; |
1254 |
|
|
1255 |
|
+retry: |
1256 |
|
err = -ENFILE; |
1257 |
|
if (!(newsock = sock_alloc())) |
1258 |
|
goto out_put; |
1259 |
|
@@ -1382,6 +1393,10 @@ SYSCALL_DEFINE3(accept, int, fd, struct |
1260 |
if (err < 0) |
if (err < 0) |
1261 |
goto out_release; |
goto out_release; |
1262 |
|
|
1263 |
+ /***** TOMOYO Linux start. *****/ |
+ if (ccs_socket_post_accept_permission(sock, newsock)) { |
1264 |
+ if (ccs_socket_accept_permission(newsock, |
+ sock_release(newsock); |
1265 |
+ (struct sockaddr *) address)) { |
+ goto retry; |
|
+ err = -ECONNABORTED; /* Hope less harmful than -EPERM. */ |
|
|
+ goto out_release; |
|
1266 |
+ } |
+ } |
|
+ /***** TOMOYO Linux end. *****/ |
|
1267 |
if (upeer_sockaddr) { |
if (upeer_sockaddr) { |
1268 |
if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) { |
if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) { |
1269 |
err = -ECONNABORTED; |
err = -ECONNABORTED; |
1270 |
@@ -1432,7 +1464,12 @@ asmlinkage long sys_connect(int fd, stru |
@@ -1436,9 +1451,11 @@ SYSCALL_DEFINE3(connect, int, fd, struct |
1271 |
|
goto out_put; |
1272 |
|
|
1273 |
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen); |
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen); |
1274 |
|
+ if (!err) |
1275 |
|
+ err = ccs_socket_connect_permission(sock, (struct sockaddr *) |
1276 |
|
+ address, addrlen); |
1277 |
if (err) |
if (err) |
1278 |
goto out_put; |
goto out_put; |
1279 |
- |
- |
|
+ /***** TOMOYO Linux start. *****/ |
|
|
+ err = ccs_socket_connect_permission(sock, (struct sockaddr *) address, |
|
|
+ addrlen); |
|
|
+ if (err) |
|
|
+ goto out_put; |
|
|
+ /***** TOMOYO Linux end. *****/ |
|
1280 |
err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, |
err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, |
1281 |
sock->file->f_flags); |
sock->file->f_flags); |
1282 |
out_put: |
out_put: |
1283 |
--- linux-2.6.15-53.75.orig/net/unix/af_unix.c |
--- linux-2.6.15-55.87.orig/net/unix/af_unix.c |
1284 |
+++ linux-2.6.15-53.75/net/unix/af_unix.c |
+++ linux-2.6.15-55.87/net/unix/af_unix.c |
1285 |
@@ -117,6 +117,9 @@ |
@@ -117,6 +117,7 @@ |
1286 |
#include <linux/mount.h> |
#include <linux/mount.h> |
1287 |
#include <net/checksum.h> |
#include <net/checksum.h> |
1288 |
#include <linux/security.h> |
#include <linux/security.h> |
1289 |
+/***** TOMOYO Linux start. *****/ |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
|
+/***** TOMOYO Linux end. *****/ |
|
1290 |
|
|
1291 |
int sysctl_unix_max_dgram_qlen = 10; |
int sysctl_unix_max_dgram_qlen = 10; |
1292 |
|
|
1293 |
@@ -781,6 +784,11 @@ static int unix_bind(struct socket *sock |
@@ -781,6 +782,9 @@ static int unix_bind(struct socket *sock |
1294 |
*/ |
*/ |
1295 |
mode = S_IFSOCK | |
mode = S_IFSOCK | |
1296 |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask); |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask); |
1297 |
+ /***** TOMOYO Linux start. *****/ |
+ err = ccs_mknod_permission(nd.dentry->d_inode, dentry, nd.mnt, |
1298 |
+ err = ccs_check_mknod_permission(nd.dentry->d_inode, dentry, |
+ mode, 0); |
|
+ nd.mnt, mode, 0); |
|
1299 |
+ if (!err) |
+ if (!err) |
|
+ /***** TOMOYO Linux end. *****/ |
|
1300 |
err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); |
err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); |
1301 |
if (err) |
if (err) |
1302 |
goto out_mknod_dput; |
goto out_mknod_dput; |
1303 |
|
@@ -1552,12 +1556,17 @@ static int unix_dgram_recvmsg(struct kio |
1304 |
|
|
1305 |
|
down(&u->readsem); |
1306 |
|
|
1307 |
|
+retry: |
1308 |
|
skb = skb_recv_datagram(sk, flags, noblock, &err); |
1309 |
|
if (!skb) |
1310 |
|
goto out_unlock; |
1311 |
|
|
1312 |
|
wake_up_interruptible(&u->peer_wait); |
1313 |
|
|
1314 |
|
+ if (ccs_socket_post_recvmsg_permission(sk, skb)) { |
1315 |
|
+ skb_kill_datagram(sk, skb, flags); |
1316 |
|
+ goto retry; |
1317 |
|
+ } |
1318 |
|
if (msg->msg_name) |
1319 |
|
unix_copy_addr(msg, skb->sk); |
1320 |
|
|
1321 |
|
--- linux-2.6.15-55.87.orig/security/Kconfig |
1322 |
|
+++ linux-2.6.15-55.87/security/Kconfig |
1323 |
|
@@ -94,5 +94,7 @@ config SECURITY_SECLVL |
1324 |
|
|
1325 |
|
source security/selinux/Kconfig |
1326 |
|
|
1327 |
|
+source security/ccsecurity/Kconfig |
1328 |
|
+ |
1329 |
|
endmenu |
1330 |
|
|
1331 |
|
--- linux-2.6.15-55.87.orig/security/Makefile |
1332 |
|
+++ linux-2.6.15-55.87/security/Makefile |
1333 |
|
@@ -19,3 +19,6 @@ obj-$(CONFIG_SECURITY_ROOTPLUG) += comm |
1334 |
|
obj-$(CONFIG_SECURITY_REALTIME) += commoncap.o realcap.o |
1335 |
|
|
1336 |
|
obj-$(CONFIG_SECURITY_SECLVL) += seclvl.o |
1337 |
|
+ |
1338 |
|
+subdir-$(CONFIG_CCSECURITY)+= ccsecurity |
1339 |
|
+obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o |