12 |
arch/sparc/kernel/ptrace.c | 5 +++++ |
arch/sparc/kernel/ptrace.c | 5 +++++ |
13 |
arch/sparc64/kernel/ptrace.c | 5 +++++ |
arch/sparc64/kernel/ptrace.c | 5 +++++ |
14 |
arch/x86_64/ia32/ptrace32.c | 3 +++ |
arch/x86_64/ia32/ptrace32.c | 3 +++ |
|
fs/Kconfig | 2 ++ |
|
|
fs/Makefile | 2 ++ |
|
15 |
fs/attr.c | 5 +++++ |
fs/attr.c | 5 +++++ |
16 |
fs/compat.c | 9 ++++++++- |
fs/compat.c | 9 ++++++++- |
17 |
fs/exec.c | 12 +++++++++++- |
fs/exec.c | 12 +++++++++++- |
18 |
fs/fcntl.c | 5 +++++ |
fs/fcntl.c | 4 ++++ |
19 |
fs/ioctl.c | 5 +++++ |
fs/ioctl.c | 5 +++++ |
20 |
fs/namei.c | 38 ++++++++++++++++++++++++++++++++++++++ |
fs/namei.c | 32 ++++++++++++++++++++++++++++++++ |
21 |
fs/namespace.c | 28 +++++++++++++++++++++++++++- |
fs/namespace.c | 24 +++++++++++++++++++++++- |
22 |
fs/open.c | 14 ++++++++++++++ |
fs/open.c | 27 +++++++++++++++++++++++++++ |
|
fs/proc/Makefile | 3 +++ |
|
23 |
fs/proc/proc_misc.c | 1 + |
fs/proc/proc_misc.c | 1 + |
24 |
include/linux/init_task.h | 2 ++ |
include/linux/init_task.h | 9 +++++++++ |
25 |
include/linux/sched.h | 4 ++++ |
include/linux/sched.h | 6 ++++++ |
26 |
kernel/compat.c | 3 +++ |
kernel/compat.c | 3 +++ |
27 |
kernel/kexec.c | 3 +++ |
kernel/kexec.c | 3 +++ |
28 |
kernel/kmod.c | 3 +++ |
kernel/kmod.c | 5 +++++ |
29 |
kernel/module.c | 7 +++++-- |
kernel/module.c | 7 +++++-- |
30 |
kernel/ptrace.c | 3 +++ |
kernel/ptrace.c | 3 +++ |
31 |
kernel/sched.c | 3 +++ |
kernel/sched.c | 3 +++ |
32 |
kernel/signal.c | 7 +++++++ |
kernel/signal.c | 9 +++++++++ |
33 |
kernel/sys.c | 11 +++++++++++ |
kernel/sys.c | 11 +++++++++++ |
34 |
kernel/sysctl.c | 11 +++++++++++ |
kernel/sysctl.c | 11 +++++++++++ |
35 |
kernel/time.c | 7 +++++++ |
kernel/time.c | 7 +++++++ |
36 |
net/ipv4/inet_connection_sock.c | 3 +++ |
net/ipv4/inet_connection_sock.c | 3 +++ |
37 |
net/ipv4/inet_hashtables.c | 3 +++ |
net/ipv4/inet_hashtables.c | 3 +++ |
38 |
net/ipv4/raw.c | 4 ++++ |
net/ipv4/raw.c | 4 ++++ |
39 |
net/ipv4/udp.c | 11 ++++++++++- |
net/ipv4/udp.c | 10 +++++++++- |
40 |
net/ipv6/inet6_hashtables.c | 5 ++++- |
net/ipv6/inet6_hashtables.c | 5 ++++- |
41 |
net/ipv6/raw.c | 4 ++++ |
net/ipv6/raw.c | 4 ++++ |
42 |
net/ipv6/udp.c | 9 +++++++++ |
net/ipv6/udp.c | 8 ++++++++ |
43 |
net/socket.c | 26 ++++++++++++++++++++++++-- |
net/socket.c | 25 +++++++++++++++++++++++-- |
44 |
net/unix/af_unix.c | 4 ++++ |
net/unix/af_unix.c | 4 ++++ |
45 |
43 files changed, 282 insertions(+), 9 deletions(-) |
security/Kconfig | 2 ++ |
46 |
|
security/Makefile | 3 +++ |
47 |
|
42 files changed, 292 insertions(+), 9 deletions(-) |
48 |
|
|
49 |
--- linux-2.6.18-24etch2.orig/arch/alpha/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/alpha/kernel/ptrace.c |
50 |
+++ linux-2.6.18-24etch2/arch/alpha/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/alpha/kernel/ptrace.c |
51 |
@@ -20,6 +20,7 @@ |
@@ -20,6 +20,7 @@ |
52 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
53 |
#include <asm/system.h> |
#include <asm/system.h> |
54 |
#include <asm/fpu.h> |
#include <asm/fpu.h> |
55 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
56 |
|
|
57 |
#include "proto.h" |
#include "proto.h" |
58 |
|
|
65 |
|
|
66 |
lock_kernel(); |
lock_kernel(); |
67 |
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", |
68 |
--- linux-2.6.18-24etch2.orig/arch/ia64/ia32/sys_ia32.c |
--- linux-2.6.18-24etch3.orig/arch/ia64/ia32/sys_ia32.c |
69 |
+++ linux-2.6.18-24etch2/arch/ia64/ia32/sys_ia32.c |
+++ linux-2.6.18-24etch3/arch/ia64/ia32/sys_ia32.c |
70 |
@@ -56,6 +56,7 @@ |
@@ -56,6 +56,7 @@ |
71 |
#include <asm/types.h> |
#include <asm/types.h> |
72 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
73 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
74 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
75 |
|
|
76 |
#include "ia32priv.h" |
#include "ia32priv.h" |
77 |
|
|
84 |
|
|
85 |
lock_kernel(); |
lock_kernel(); |
86 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
87 |
--- linux-2.6.18-24etch2.orig/arch/ia64/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/ia64/kernel/ptrace.c |
88 |
+++ linux-2.6.18-24etch2/arch/ia64/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/ia64/kernel/ptrace.c |
89 |
@@ -28,6 +28,7 @@ |
@@ -28,6 +28,7 @@ |
90 |
#ifdef CONFIG_PERFMON |
#ifdef CONFIG_PERFMON |
91 |
#include <asm/perfmon.h> |
#include <asm/perfmon.h> |
92 |
#endif |
#endif |
93 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
94 |
|
|
95 |
#include "entry.h" |
#include "entry.h" |
96 |
|
|
103 |
|
|
104 |
lock_kernel(); |
lock_kernel(); |
105 |
ret = -EPERM; |
ret = -EPERM; |
106 |
--- linux-2.6.18-24etch2.orig/arch/m32r/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/m32r/kernel/ptrace.c |
107 |
+++ linux-2.6.18-24etch2/arch/m32r/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/m32r/kernel/ptrace.c |
108 |
@@ -32,6 +32,7 @@ |
@@ -32,6 +32,7 @@ |
109 |
#include <asm/system.h> |
#include <asm/system.h> |
110 |
#include <asm/processor.h> |
#include <asm/processor.h> |
111 |
#include <asm/mmu_context.h> |
#include <asm/mmu_context.h> |
112 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
113 |
|
|
114 |
/* |
/* |
115 |
* This routine will get a word off of the process kernel stack. |
* This routine will get a word off of the process kernel stack. |
122 |
|
|
123 |
lock_kernel(); |
lock_kernel(); |
124 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
125 |
--- linux-2.6.18-24etch2.orig/arch/mips/kernel/ptrace32.c |
--- linux-2.6.18-24etch3.orig/arch/mips/kernel/ptrace32.c |
126 |
+++ linux-2.6.18-24etch2/arch/mips/kernel/ptrace32.c |
+++ linux-2.6.18-24etch3/arch/mips/kernel/ptrace32.c |
127 |
@@ -35,6 +35,7 @@ |
@@ -35,6 +35,7 @@ |
128 |
#include <asm/system.h> |
#include <asm/system.h> |
129 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
130 |
#include <asm/bootinfo.h> |
#include <asm/bootinfo.h> |
131 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
132 |
|
|
133 |
int ptrace_getregs (struct task_struct *child, __s64 __user *data); |
int ptrace_getregs (struct task_struct *child, __s64 __user *data); |
134 |
int ptrace_setregs (struct task_struct *child, __s64 __user *data); |
int ptrace_setregs (struct task_struct *child, __s64 __user *data); |
141 |
|
|
142 |
#if 0 |
#if 0 |
143 |
printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", |
printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", |
144 |
--- linux-2.6.18-24etch2.orig/arch/powerpc/kernel/ptrace32.c |
--- linux-2.6.18-24etch3.orig/arch/powerpc/kernel/ptrace32.c |
145 |
+++ linux-2.6.18-24etch2/arch/powerpc/kernel/ptrace32.c |
+++ linux-2.6.18-24etch3/arch/powerpc/kernel/ptrace32.c |
146 |
@@ -32,6 +32,7 @@ |
@@ -32,6 +32,7 @@ |
147 |
#include <asm/page.h> |
#include <asm/page.h> |
148 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
149 |
#include <asm/system.h> |
#include <asm/system.h> |
150 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
151 |
|
|
152 |
#include "ptrace-common.h" |
#include "ptrace-common.h" |
153 |
|
|
160 |
|
|
161 |
lock_kernel(); |
lock_kernel(); |
162 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
163 |
--- linux-2.6.18-24etch2.orig/arch/s390/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/s390/kernel/ptrace.c |
164 |
+++ linux-2.6.18-24etch2/arch/s390/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/s390/kernel/ptrace.c |
165 |
@@ -41,6 +41,7 @@ |
@@ -41,6 +41,7 @@ |
166 |
#include <asm/system.h> |
#include <asm/system.h> |
167 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
168 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
169 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
170 |
|
|
171 |
#ifdef CONFIG_COMPAT |
#ifdef CONFIG_COMPAT |
172 |
#include "compat_ptrace.h" |
#include "compat_ptrace.h" |
179 |
lock_kernel(); |
lock_kernel(); |
180 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
181 |
ret = ptrace_traceme(); |
ret = ptrace_traceme(); |
182 |
--- linux-2.6.18-24etch2.orig/arch/sparc/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/sparc/kernel/ptrace.c |
183 |
+++ linux-2.6.18-24etch2/arch/sparc/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/sparc/kernel/ptrace.c |
184 |
@@ -23,6 +23,7 @@ |
@@ -23,6 +23,7 @@ |
185 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
186 |
#include <asm/system.h> |
#include <asm/system.h> |
187 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
188 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
189 |
|
|
190 |
#define MAGIC_CONSTANT 0x80000000 |
#define MAGIC_CONSTANT 0x80000000 |
191 |
|
|
200 |
|
|
201 |
lock_kernel(); |
lock_kernel(); |
202 |
#ifdef DEBUG_PTRACE |
#ifdef DEBUG_PTRACE |
203 |
--- linux-2.6.18-24etch2.orig/arch/sparc64/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/arch/sparc64/kernel/ptrace.c |
204 |
+++ linux-2.6.18-24etch2/arch/sparc64/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/arch/sparc64/kernel/ptrace.c |
205 |
@@ -32,6 +32,7 @@ |
@@ -32,6 +32,7 @@ |
206 |
#include <asm/spitfire.h> |
#include <asm/spitfire.h> |
207 |
#include <asm/page.h> |
#include <asm/page.h> |
208 |
#include <asm/cpudata.h> |
#include <asm/cpudata.h> |
209 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
210 |
|
|
211 |
/* Returning from ptrace is a bit tricky because the syscall return |
/* Returning from ptrace is a bit tricky because the syscall return |
212 |
* low level code assumes any value returned which is negative and |
* low level code assumes any value returned which is negative and |
221 |
|
|
222 |
if (test_thread_flag(TIF_32BIT)) { |
if (test_thread_flag(TIF_32BIT)) { |
223 |
addr &= 0xffffffffUL; |
addr &= 0xffffffffUL; |
224 |
--- linux-2.6.18-24etch2.orig/arch/x86_64/ia32/ptrace32.c |
--- linux-2.6.18-24etch3.orig/arch/x86_64/ia32/ptrace32.c |
225 |
+++ linux-2.6.18-24etch2/arch/x86_64/ia32/ptrace32.c |
+++ linux-2.6.18-24etch3/arch/x86_64/ia32/ptrace32.c |
226 |
@@ -26,6 +26,7 @@ |
@@ -26,6 +26,7 @@ |
227 |
#include <asm/i387.h> |
#include <asm/i387.h> |
228 |
#include <asm/fpu32.h> |
#include <asm/fpu32.h> |
229 |
#include <asm/ia32.h> |
#include <asm/ia32.h> |
230 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
231 |
|
|
232 |
/* |
/* |
233 |
* Determines which flags the user has access to [1 = access, 0 = no access]. |
* Determines which flags the user has access to [1 = access, 0 = no access]. |
240 |
|
|
241 |
switch (request) { |
switch (request) { |
242 |
case PTRACE_TRACEME: |
case PTRACE_TRACEME: |
243 |
--- linux-2.6.18-24etch2.orig/fs/Kconfig |
--- linux-2.6.18-24etch3.orig/fs/attr.c |
244 |
+++ linux-2.6.18-24etch2/fs/Kconfig |
+++ linux-2.6.18-24etch3/fs/attr.c |
|
@@ -1931,5 +1931,7 @@ endmenu |
|
|
|
|
|
source "fs/nls/Kconfig" |
|
|
|
|
|
+source "fs/Kconfig.ccs" |
|
|
+ |
|
|
endmenu |
|
|
|
|
|
--- linux-2.6.18-24etch2.orig/fs/Makefile |
|
|
+++ linux-2.6.18-24etch2/fs/Makefile |
|
|
@@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS) += hostfs/ |
|
|
obj-$(CONFIG_HPPFS) += hppfs/ |
|
|
obj-$(CONFIG_DEBUG_FS) += debugfs/ |
|
|
obj-$(CONFIG_OCFS2_FS) += ocfs2/ |
|
|
+ |
|
|
+include $(srctree)/fs/Makefile-2.6.ccs |
|
|
--- linux-2.6.18-24etch2.orig/fs/attr.c |
|
|
+++ linux-2.6.18-24etch2/fs/attr.c |
|
245 |
@@ -15,6 +15,7 @@ |
@@ -15,6 +15,7 @@ |
246 |
#include <linux/fcntl.h> |
#include <linux/fcntl.h> |
247 |
#include <linux/quotaops.h> |
#include <linux/quotaops.h> |
248 |
#include <linux/security.h> |
#include <linux/security.h> |
249 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
250 |
|
|
251 |
/* Taken over from the old code... */ |
/* Taken over from the old code... */ |
252 |
|
|
254 |
if (inode->i_op && inode->i_op->setattr) { |
if (inode->i_op && inode->i_op->setattr) { |
255 |
error = security_inode_setattr(dentry, attr); |
error = security_inode_setattr(dentry, attr); |
256 |
if (!error) |
if (!error) |
257 |
+ error = ccs_check_setattr_permission(dentry, attr); |
+ error = ccs_setattr_permission(dentry, attr); |
258 |
+ if (!error) |
+ if (!error) |
259 |
error = inode->i_op->setattr(dentry, attr); |
error = inode->i_op->setattr(dentry, attr); |
260 |
} else { |
} else { |
262 |
if (!error) |
if (!error) |
263 |
error = security_inode_setattr(dentry, attr); |
error = security_inode_setattr(dentry, attr); |
264 |
+ if (!error) |
+ if (!error) |
265 |
+ error = ccs_check_setattr_permission(dentry, attr); |
+ error = ccs_setattr_permission(dentry, attr); |
266 |
if (!error) { |
if (!error) { |
267 |
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || |
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || |
268 |
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) |
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) |
269 |
--- linux-2.6.18-24etch2.orig/fs/compat.c |
--- linux-2.6.18-24etch3.orig/fs/compat.c |
270 |
+++ linux-2.6.18-24etch2/fs/compat.c |
+++ linux-2.6.18-24etch3/fs/compat.c |
271 |
@@ -52,6 +52,7 @@ |
@@ -52,6 +52,7 @@ |
272 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
273 |
#include <asm/mmu_context.h> |
#include <asm/mmu_context.h> |
274 |
#include <asm/ioctls.h> |
#include <asm/ioctls.h> |
275 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
276 |
|
|
277 |
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); |
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); |
278 |
|
|
305 |
if (retval >= 0) { |
if (retval >= 0) { |
306 |
free_arg_pages(bprm); |
free_arg_pages(bprm); |
307 |
|
|
308 |
--- linux-2.6.18-24etch2.orig/fs/exec.c |
--- linux-2.6.18-24etch3.orig/fs/exec.c |
309 |
+++ linux-2.6.18-24etch2/fs/exec.c |
+++ linux-2.6.18-24etch3/fs/exec.c |
310 |
@@ -57,6 +57,8 @@ |
@@ -57,6 +57,8 @@ |
311 |
#include <linux/kmod.h> |
#include <linux/kmod.h> |
312 |
#endif |
#endif |
313 |
|
|
314 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
315 |
+ |
+ |
316 |
int core_uses_pid; |
int core_uses_pid; |
317 |
char core_pattern[65] = "core"; |
char core_pattern[65] = "core"; |
320 |
if (error) |
if (error) |
321 |
goto exit; |
goto exit; |
322 |
|
|
323 |
+ error = ccs_check_uselib_permission(nd.dentry, nd.mnt); |
+ error = ccs_uselib_permission(nd.dentry, nd.mnt); |
324 |
+ if (error) |
+ if (error) |
325 |
+ goto exit; |
+ goto exit; |
326 |
+ |
+ |
332 |
S_ISREG(inode->i_mode)) { |
S_ISREG(inode->i_mode)) { |
333 |
int err = vfs_permission(&nd, MAY_EXEC); |
int err = vfs_permission(&nd, MAY_EXEC); |
334 |
+ if (!err) |
+ if (!err) |
335 |
+ err = ccs_check_open_exec_permission(nd.dentry, |
+ err = ccs_open_exec_permission(nd.dentry, |
336 |
+ nd.mnt); |
+ nd.mnt); |
337 |
file = ERR_PTR(err); |
file = ERR_PTR(err); |
338 |
if (!err) { |
if (!err) { |
347 |
if (retval >= 0) { |
if (retval >= 0) { |
348 |
free_arg_pages(bprm); |
free_arg_pages(bprm); |
349 |
|
|
350 |
--- linux-2.6.18-24etch2.orig/fs/fcntl.c |
--- linux-2.6.18-24etch3.orig/fs/fcntl.c |
351 |
+++ linux-2.6.18-24etch2/fs/fcntl.c |
+++ linux-2.6.18-24etch3/fs/fcntl.c |
352 |
@@ -22,6 +22,7 @@ |
@@ -22,6 +22,7 @@ |
353 |
#include <asm/poll.h> |
#include <asm/poll.h> |
354 |
#include <asm/siginfo.h> |
#include <asm/siginfo.h> |
355 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
356 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
357 |
|
|
358 |
void fastcall set_close_on_exec(unsigned int fd, int flag) |
void fastcall set_close_on_exec(unsigned int fd, int flag) |
359 |
{ |
{ |
360 |
@@ -214,6 +215,10 @@ static int setfl(int fd, struct file * f |
@@ -214,6 +215,9 @@ static int setfl(int fd, struct file * f |
361 |
if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode)) |
if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode)) |
362 |
return -EPERM; |
return -EPERM; |
363 |
|
|
364 |
+ if (((arg ^ filp->f_flags) & O_APPEND) && |
+ if (((arg ^ filp->f_flags) & O_APPEND) && ccs_rewrite_permission(filp)) |
|
+ ccs_check_rewrite_permission(filp)) |
|
365 |
+ return -EPERM; |
+ return -EPERM; |
366 |
+ |
+ |
367 |
/* O_NOATIME can only be set by the owner or superuser */ |
/* O_NOATIME can only be set by the owner or superuser */ |
368 |
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME)) |
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME)) |
369 |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) |
370 |
--- linux-2.6.18-24etch2.orig/fs/ioctl.c |
--- linux-2.6.18-24etch3.orig/fs/ioctl.c |
371 |
+++ linux-2.6.18-24etch2/fs/ioctl.c |
+++ linux-2.6.18-24etch3/fs/ioctl.c |
372 |
@@ -15,6 +15,7 @@ |
@@ -15,6 +15,7 @@ |
373 |
|
|
374 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
375 |
#include <asm/ioctls.h> |
#include <asm/ioctls.h> |
376 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
377 |
|
|
378 |
static long do_ioctl(struct file *filp, unsigned int cmd, |
static long do_ioctl(struct file *filp, unsigned int cmd, |
379 |
unsigned long arg) |
unsigned long arg) |
391 |
|
|
392 |
error = security_file_ioctl(filp, cmd, arg); |
error = security_file_ioctl(filp, cmd, arg); |
393 |
+ if (!error) |
+ if (!error) |
394 |
+ error = ccs_check_ioctl_permission(filp, cmd, arg); |
+ error = ccs_ioctl_permission(filp, cmd, arg); |
395 |
if (error) |
if (error) |
396 |
goto out_fput; |
goto out_fput; |
397 |
|
|
398 |
--- linux-2.6.18-24etch2.orig/fs/namei.c |
--- linux-2.6.18-24etch3.orig/fs/namei.c |
399 |
+++ linux-2.6.18-24etch2/fs/namei.c |
+++ linux-2.6.18-24etch3/fs/namei.c |
400 |
@@ -37,6 +37,8 @@ |
@@ -37,6 +37,8 @@ |
401 |
|
|
402 |
#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) |
#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) |
403 |
|
|
404 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
405 |
+ |
+ |
406 |
/* [Feb-1997 T. Schoebel-Theuer] |
/* [Feb-1997 T. Schoebel-Theuer] |
407 |
* Fundamental changes in the pathname lookup mechanisms (namei) |
* Fundamental changes in the pathname lookup mechanisms (namei) |
411 |
return -EPERM; |
return -EPERM; |
412 |
|
|
413 |
+ /* includes O_APPEND and O_TRUNC checks */ |
+ /* includes O_APPEND and O_TRUNC checks */ |
414 |
+ error = ccs_check_open_permission(dentry, nd->mnt, flag); |
+ error = ccs_open_permission(dentry, nd->mnt, flag); |
415 |
+ if (error) |
+ if (error) |
416 |
+ return error; |
+ return error; |
417 |
+ |
+ |
422 |
return 0; |
return 0; |
423 |
} |
} |
424 |
|
|
425 |
+#include <linux/tomoyo_vfs.h> |
+#include <linux/ccsecurity_vfs.h> |
426 |
/* |
/* |
427 |
* open_namei() |
* open_namei() |
428 |
* |
* |
430 |
if (!path.dentry->d_inode) { |
if (!path.dentry->d_inode) { |
431 |
if (!IS_POSIXACL(dir->d_inode)) |
if (!IS_POSIXACL(dir->d_inode)) |
432 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
433 |
+ error = ccs_check_mknod_permission(dir->d_inode, path.dentry, |
+ error = ccs_mknod_permission(dir->d_inode, path.dentry, |
434 |
+ nd->mnt, mode, 0); |
+ nd->mnt, mode, 0); |
435 |
+ if (!error) |
+ if (!error) |
436 |
error = vfs_create(dir->d_inode, path.dentry, mode, nd); |
error = vfs_create(dir->d_inode, path.dentry, mode, nd); |
437 |
mutex_unlock(&dir->d_inode->i_mutex); |
mutex_unlock(&dir->d_inode->i_mutex); |
438 |
dput(nd->dentry); |
dput(nd->dentry); |
439 |
@@ -1848,6 +1859,10 @@ asmlinkage long sys_mknodat(int dfd, con |
@@ -1848,6 +1859,9 @@ asmlinkage long sys_mknodat(int dfd, con |
440 |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
441 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
442 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
443 |
+ error = ccs_check_mknod_permission(nd.dentry->d_inode, dentry, |
+ error = ccs_mknod_permission(nd.dentry->d_inode, dentry, |
444 |
+ nd.mnt, mode, |
+ nd.mnt, mode, dev); |
|
+ new_decode_dev(dev)); |
|
445 |
+ if (!error) |
+ if (!error) |
446 |
switch (mode & S_IFMT) { |
switch (mode & S_IFMT) { |
447 |
case 0: case S_IFREG: |
case 0: case S_IFREG: |
448 |
error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); |
error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); |
449 |
@@ -1921,6 +1936,10 @@ asmlinkage long sys_mkdirat(int dfd, con |
@@ -1921,6 +1935,9 @@ asmlinkage long sys_mkdirat(int dfd, con |
450 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
451 |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
if (!IS_POSIXACL(nd.dentry->d_inode)) |
452 |
mode &= ~current->fs->umask; |
mode &= ~current->fs->umask; |
453 |
+ error = ccs_check_mkdir_permission(nd.dentry->d_inode, |
+ error = ccs_mkdir_permission(nd.dentry->d_inode, |
454 |
+ dentry, nd.mnt, |
+ dentry, nd.mnt, mode); |
|
+ mode); |
|
455 |
+ if (!error) |
+ if (!error) |
456 |
error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); |
error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); |
457 |
dput(dentry); |
dput(dentry); |
458 |
} |
} |
459 |
@@ -2029,6 +2048,9 @@ static long do_rmdir(int dfd, const char |
@@ -2029,6 +2046,9 @@ static long do_rmdir(int dfd, const char |
460 |
dentry = lookup_hash(&nd); |
dentry = lookup_hash(&nd); |
461 |
error = PTR_ERR(dentry); |
error = PTR_ERR(dentry); |
462 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
463 |
+ error = ccs_check_rmdir_permission(nd.dentry->d_inode, dentry, |
+ error = ccs_rmdir_permission(nd.dentry->d_inode, dentry, |
464 |
+ nd.mnt); |
+ nd.mnt); |
465 |
+ if (!error) |
+ if (!error) |
466 |
error = vfs_rmdir(nd.dentry->d_inode, dentry); |
error = vfs_rmdir(nd.dentry->d_inode, dentry); |
467 |
dput(dentry); |
dput(dentry); |
468 |
} |
} |
469 |
@@ -2109,6 +2131,9 @@ static long do_unlinkat(int dfd, const c |
@@ -2109,6 +2129,9 @@ static long do_unlinkat(int dfd, const c |
470 |
inode = dentry->d_inode; |
inode = dentry->d_inode; |
471 |
if (inode) |
if (inode) |
472 |
atomic_inc(&inode->i_count); |
atomic_inc(&inode->i_count); |
473 |
+ error = ccs_check_unlink_permission(nd.dentry->d_inode, dentry, |
+ error = ccs_unlink_permission(nd.dentry->d_inode, dentry, |
474 |
+ nd.mnt); |
+ nd.mnt); |
475 |
+ if (!error) |
+ if (!error) |
476 |
error = vfs_unlink(nd.dentry->d_inode, dentry); |
error = vfs_unlink(nd.dentry->d_inode, dentry); |
477 |
exit2: |
exit2: |
478 |
dput(dentry); |
dput(dentry); |
479 |
@@ -2187,6 +2212,10 @@ asmlinkage long sys_symlinkat(const char |
@@ -2187,6 +2210,9 @@ asmlinkage long sys_symlinkat(const char |
480 |
dentry = lookup_create(&nd, 0); |
dentry = lookup_create(&nd, 0); |
481 |
error = PTR_ERR(dentry); |
error = PTR_ERR(dentry); |
482 |
if (!IS_ERR(dentry)) { |
if (!IS_ERR(dentry)) { |
483 |
+ error = ccs_check_symlink_permission(nd.dentry->d_inode, |
+ error = ccs_symlink_permission(nd.dentry->d_inode, |
484 |
+ dentry, nd.mnt, |
+ dentry, nd.mnt, from); |
|
+ from); |
|
485 |
+ if (!error) |
+ if (!error) |
486 |
error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); |
error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); |
487 |
dput(dentry); |
dput(dentry); |
488 |
} |
} |
489 |
@@ -2281,6 +2310,10 @@ asmlinkage long sys_linkat(int olddfd, c |
@@ -2281,6 +2307,9 @@ asmlinkage long sys_linkat(int olddfd, c |
490 |
new_dentry = lookup_create(&nd, 0); |
new_dentry = lookup_create(&nd, 0); |
491 |
error = PTR_ERR(new_dentry); |
error = PTR_ERR(new_dentry); |
492 |
if (!IS_ERR(new_dentry)) { |
if (!IS_ERR(new_dentry)) { |
493 |
+ error = ccs_check_link_permission(old_nd.dentry, |
+ error = ccs_link_permission(old_nd.dentry, nd.dentry->d_inode, |
494 |
+ nd.dentry->d_inode, |
+ new_dentry, nd.mnt); |
|
+ new_dentry, nd.mnt); |
|
495 |
+ if (!error) |
+ if (!error) |
496 |
error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); |
error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); |
497 |
dput(new_dentry); |
dput(new_dentry); |
498 |
} |
} |
499 |
@@ -2507,6 +2540,11 @@ static int do_rename(int olddfd, const c |
@@ -2507,6 +2536,9 @@ static int do_rename(int olddfd, const c |
500 |
if (new_dentry == trap) |
if (new_dentry == trap) |
501 |
goto exit5; |
goto exit5; |
502 |
|
|
503 |
+ error = ccs_check_rename_permission(old_dir->d_inode, old_dentry, |
+ error = ccs_rename_permission(old_dir->d_inode, old_dentry, |
504 |
+ new_dir->d_inode, new_dentry, |
+ new_dir->d_inode, new_dentry, newnd.mnt); |
|
+ newnd.mnt); |
|
505 |
+ if (!error) |
+ if (!error) |
|
+ |
|
506 |
error = vfs_rename(old_dir->d_inode, old_dentry, |
error = vfs_rename(old_dir->d_inode, old_dentry, |
507 |
new_dir->d_inode, new_dentry); |
new_dir->d_inode, new_dentry); |
508 |
exit5: |
exit5: |
509 |
--- linux-2.6.18-24etch2.orig/fs/namespace.c |
--- linux-2.6.18-24etch3.orig/fs/namespace.c |
510 |
+++ linux-2.6.18-24etch2/fs/namespace.c |
+++ linux-2.6.18-24etch3/fs/namespace.c |
511 |
@@ -25,6 +25,8 @@ |
@@ -25,6 +25,7 @@ |
512 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
513 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
514 |
#include "pnode.h" |
#include "pnode.h" |
515 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
516 |
|
|
517 |
extern int __init init_rootfs(void); |
extern int __init init_rootfs(void); |
518 |
|
|
519 |
@@ -553,6 +555,9 @@ static int do_umount(struct vfsmount *mn |
@@ -553,6 +554,9 @@ static int do_umount(struct vfsmount *mn |
520 |
if (retval) |
if (retval) |
521 |
return retval; |
return retval; |
522 |
|
|
526 |
/* |
/* |
527 |
* Allow userspace to request a mountpoint be expired rather than |
* Allow userspace to request a mountpoint be expired rather than |
528 |
* unmounting unconditionally. Unmount only happens if: |
* unmounting unconditionally. Unmount only happens if: |
529 |
@@ -641,6 +646,8 @@ asmlinkage long sys_umount(char __user * |
@@ -641,6 +645,8 @@ asmlinkage long sys_umount(char __user * |
530 |
{ |
{ |
531 |
struct nameidata nd; |
struct nameidata nd; |
532 |
int retval; |
int retval; |
535 |
|
|
536 |
retval = __user_walk(name, LOOKUP_FOLLOW, &nd); |
retval = __user_walk(name, LOOKUP_FOLLOW, &nd); |
537 |
if (retval) |
if (retval) |
538 |
@@ -925,6 +932,9 @@ static int do_loopback(struct nameidata |
@@ -925,6 +931,9 @@ static int do_loopback(struct nameidata |
539 |
|
|
540 |
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
541 |
goto out; |
goto out; |
545 |
|
|
546 |
err = -ENOMEM; |
err = -ENOMEM; |
547 |
if (recurse) |
if (recurse) |
548 |
@@ -1009,7 +1019,9 @@ static int do_move_mount(struct nameidat |
@@ -1009,7 +1018,9 @@ static int do_move_mount(struct nameidat |
549 |
err = -EINVAL; |
err = -EINVAL; |
550 |
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt)) |
551 |
goto out; |
goto out; |
556 |
err = -ENOENT; |
err = -ENOENT; |
557 |
mutex_lock(&nd->dentry->d_inode->i_mutex); |
mutex_lock(&nd->dentry->d_inode->i_mutex); |
558 |
if (IS_DEADDIR(nd->dentry->d_inode)) |
if (IS_DEADDIR(nd->dentry->d_inode)) |
559 |
@@ -1111,6 +1123,9 @@ int do_add_mount(struct vfsmount *newmnt |
@@ -1111,6 +1122,9 @@ int do_add_mount(struct vfsmount *newmnt |
560 |
err = -EINVAL; |
err = -EINVAL; |
561 |
if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode)) |
if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode)) |
562 |
goto unlock; |
goto unlock; |
566 |
|
|
567 |
newmnt->mnt_flags = mnt_flags; |
newmnt->mnt_flags = mnt_flags; |
568 |
if ((err = graft_tree(newmnt, nd))) |
if ((err = graft_tree(newmnt, nd))) |
569 |
@@ -1402,6 +1417,13 @@ long do_mount(char *dev_name, char *dir_ |
@@ -1402,6 +1416,10 @@ long do_mount(char *dev_name, char *dir_ |
570 |
if (data_page) |
if (data_page) |
571 |
((char *)data_page)[PAGE_SIZE - 1] = 0; |
((char *)data_page)[PAGE_SIZE - 1] = 0; |
572 |
|
|
573 |
+ if (!ccs_capable(CCS_SYS_MOUNT)) |
+ retval = ccs_mount_permission(dev_name, dir_name, type_page, &flags); |
|
+ return -EPERM; |
|
|
+ retval = ccs_check_mount_permission(dev_name, dir_name, type_page, |
|
|
+ &flags); |
|
574 |
+ if (retval) |
+ if (retval) |
575 |
+ return retval; |
+ return retval; |
576 |
+ |
+ |
577 |
/* Separate the per-mountpoint flags */ |
/* Separate the per-mountpoint flags */ |
578 |
if (flags & MS_NOSUID) |
if (flags & MS_NOSUID) |
579 |
mnt_flags |= MNT_NOSUID; |
mnt_flags |= MNT_NOSUID; |
580 |
@@ -1691,6 +1713,8 @@ asmlinkage long sys_pivot_root(const cha |
@@ -1691,6 +1709,8 @@ asmlinkage long sys_pivot_root(const cha |
581 |
|
|
582 |
if (!capable(CAP_SYS_ADMIN)) |
if (!capable(CAP_SYS_ADMIN)) |
583 |
return -EPERM; |
return -EPERM; |
586 |
|
|
587 |
lock_kernel(); |
lock_kernel(); |
588 |
|
|
589 |
@@ -1707,6 +1731,8 @@ asmlinkage long sys_pivot_root(const cha |
@@ -1707,6 +1727,8 @@ asmlinkage long sys_pivot_root(const cha |
590 |
goto out1; |
goto out1; |
591 |
|
|
592 |
error = security_sb_pivotroot(&old_nd, &new_nd); |
error = security_sb_pivotroot(&old_nd, &new_nd); |
593 |
+ if (!error) |
+ if (!error) |
594 |
+ error = ccs_check_pivot_root_permission(&old_nd, &new_nd); |
+ error = ccs_pivot_root_permission(&old_nd, &new_nd); |
595 |
if (error) { |
if (error) { |
596 |
path_release(&old_nd); |
path_release(&old_nd); |
597 |
goto out1; |
goto out1; |
598 |
--- linux-2.6.18-24etch2.orig/fs/open.c |
--- linux-2.6.18-24etch3.orig/fs/open.c |
599 |
+++ linux-2.6.18-24etch2/fs/open.c |
+++ linux-2.6.18-24etch3/fs/open.c |
600 |
@@ -30,6 +30,8 @@ |
@@ -30,6 +30,7 @@ |
601 |
#include <linux/audit.h> |
#include <linux/audit.h> |
602 |
|
|
603 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
604 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo.h> |
|
605 |
|
|
606 |
int vfs_statfs(struct dentry *dentry, struct kstatfs *buf) |
int vfs_statfs(struct dentry *dentry, struct kstatfs *buf) |
607 |
{ |
{ |
608 |
@@ -267,6 +269,8 @@ static long do_sys_truncate(const char _ |
@@ -267,6 +268,8 @@ static long do_sys_truncate(const char _ |
609 |
if (error) |
if (error) |
610 |
goto dput_and_out; |
goto dput_and_out; |
611 |
|
|
612 |
+ error = ccs_check_truncate_permission(nd.dentry, nd.mnt, length, 0); |
+ error = ccs_truncate_permission(nd.dentry, nd.mnt, length, 0); |
613 |
+ if (!error) |
+ if (!error) |
614 |
error = locks_verify_truncate(inode, NULL, length); |
error = locks_verify_truncate(inode, NULL, length); |
615 |
if (!error) { |
if (!error) { |
616 |
DQUOT_INIT(inode); |
DQUOT_INIT(inode); |
617 |
@@ -320,6 +324,10 @@ static long do_sys_ftruncate(unsigned in |
@@ -320,6 +323,9 @@ static long do_sys_ftruncate(unsigned in |
618 |
if (IS_APPEND(inode)) |
if (IS_APPEND(inode)) |
619 |
goto out_putf; |
goto out_putf; |
620 |
|
|
621 |
+ error = ccs_check_truncate_permission(dentry, file->f_vfsmnt, length, |
+ error = ccs_truncate_permission(dentry, file->f_vfsmnt, length, 0); |
|
+ 0); |
|
622 |
+ if (error) |
+ if (error) |
623 |
+ goto out_putf; |
+ goto out_putf; |
624 |
error = locks_verify_truncate(inode, file, length); |
error = locks_verify_truncate(inode, file, length); |
625 |
if (!error) |
if (!error) |
626 |
error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file); |
error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file); |
627 |
@@ -608,6 +616,10 @@ asmlinkage long sys_chroot(const char __ |
@@ -608,6 +614,10 @@ asmlinkage long sys_chroot(const char __ |
628 |
error = -EPERM; |
error = -EPERM; |
629 |
if (!capable(CAP_SYS_CHROOT)) |
if (!capable(CAP_SYS_CHROOT)) |
630 |
goto dput_and_out; |
goto dput_and_out; |
631 |
+ if (!ccs_capable(CCS_SYS_CHROOT)) |
+ if (!ccs_capable(CCS_SYS_CHROOT)) |
632 |
+ goto dput_and_out; |
+ goto dput_and_out; |
633 |
+ if (ccs_check_chroot_permission(&nd)) |
+ if (ccs_chroot_permission(&nd)) |
634 |
+ goto dput_and_out; |
+ goto dput_and_out; |
635 |
|
|
636 |
set_fs_root(current->fs, nd.mnt, nd.dentry); |
set_fs_root(current->fs, nd.mnt, nd.dentry); |
637 |
set_fs_altroot(); |
set_fs_altroot(); |
638 |
@@ -1199,6 +1211,8 @@ EXPORT_SYMBOL(sys_close); |
@@ -641,6 +651,9 @@ asmlinkage long sys_fchmod(unsigned int |
639 |
|
err = -EPERM; |
640 |
|
if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) |
641 |
|
goto out_putf; |
642 |
|
+ err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode); |
643 |
|
+ if (err) |
644 |
|
+ goto out_putf; |
645 |
|
mutex_lock(&inode->i_mutex); |
646 |
|
if (mode == (mode_t) -1) |
647 |
|
mode = inode->i_mode; |
648 |
|
@@ -675,6 +688,9 @@ asmlinkage long sys_fchmodat(int dfd, co |
649 |
|
error = -EPERM; |
650 |
|
if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) |
651 |
|
goto dput_and_out; |
652 |
|
+ error = ccs_chmod_permission(nd.dentry, nd.mnt, mode); |
653 |
|
+ if (error) |
654 |
|
+ goto dput_and_out; |
655 |
|
|
656 |
|
mutex_lock(&inode->i_mutex); |
657 |
|
if (mode == (mode_t) -1) |
658 |
|
@@ -737,6 +753,8 @@ asmlinkage long sys_chown(const char __u |
659 |
|
|
660 |
|
error = user_path_walk(filename, &nd); |
661 |
|
if (!error) { |
662 |
|
+ error = ccs_chown_permission(nd.dentry, nd.mnt, user, group); |
663 |
|
+ if (!error) |
664 |
|
error = chown_common(nd.dentry, user, group); |
665 |
|
path_release(&nd); |
666 |
|
} |
667 |
|
@@ -756,6 +774,8 @@ asmlinkage long sys_fchownat(int dfd, co |
668 |
|
follow = (flag & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW; |
669 |
|
error = __user_walk_fd(dfd, filename, follow, &nd); |
670 |
|
if (!error) { |
671 |
|
+ error = ccs_chown_permission(nd.dentry, nd.mnt, user, group); |
672 |
|
+ if (!error) |
673 |
|
error = chown_common(nd.dentry, user, group); |
674 |
|
path_release(&nd); |
675 |
|
} |
676 |
|
@@ -770,6 +790,8 @@ asmlinkage long sys_lchown(const char __ |
677 |
|
|
678 |
|
error = user_path_walk_link(filename, &nd); |
679 |
|
if (!error) { |
680 |
|
+ error = ccs_chown_permission(nd.dentry, nd.mnt, user, group); |
681 |
|
+ if (!error) |
682 |
|
error = chown_common(nd.dentry, user, group); |
683 |
|
path_release(&nd); |
684 |
|
} |
685 |
|
@@ -787,6 +809,9 @@ asmlinkage long sys_fchown(unsigned int |
686 |
|
struct dentry * dentry; |
687 |
|
dentry = file->f_dentry; |
688 |
|
audit_inode(NULL, dentry->d_inode); |
689 |
|
+ error = ccs_chown_permission(dentry, file->f_vfsmnt, user, |
690 |
|
+ group); |
691 |
|
+ if (!error) |
692 |
|
error = chown_common(dentry, user, group); |
693 |
|
fput(file); |
694 |
|
} |
695 |
|
@@ -1199,6 +1224,8 @@ EXPORT_SYMBOL(sys_close); |
696 |
*/ |
*/ |
697 |
asmlinkage long sys_vhangup(void) |
asmlinkage long sys_vhangup(void) |
698 |
{ |
{ |
701 |
if (capable(CAP_SYS_TTY_CONFIG)) { |
if (capable(CAP_SYS_TTY_CONFIG)) { |
702 |
tty_vhangup(current->signal->tty); |
tty_vhangup(current->signal->tty); |
703 |
return 0; |
return 0; |
704 |
--- linux-2.6.18-24etch2.orig/fs/proc/Makefile |
--- linux-2.6.18-24etch3.orig/fs/proc/proc_misc.c |
705 |
+++ linux-2.6.18-24etch2/fs/proc/Makefile |
+++ linux-2.6.18-24etch3/fs/proc/proc_misc.c |
|
@@ -13,3 +13,6 @@ proc-y += inode.o root.o base.o ge |
|
|
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.18-24etch2.orig/fs/proc/proc_misc.c |
|
|
+++ linux-2.6.18-24etch2/fs/proc/proc_misc.c |
|
706 |
@@ -723,4 +723,5 @@ void __init proc_misc_init(void) |
@@ -723,4 +723,5 @@ void __init proc_misc_init(void) |
707 |
if (entry) |
if (entry) |
708 |
entry->proc_fops = &proc_sysrq_trigger_operations; |
entry->proc_fops = &proc_sysrq_trigger_operations; |
709 |
#endif |
#endif |
710 |
+ printk(KERN_INFO "Hook version: 2.6.18-24etch2 2009/08/05\n"); |
+ printk(KERN_INFO "Hook version: 2.6.18-24etch3 2009/08/23\n"); |
711 |
} |
} |
712 |
--- linux-2.6.18-24etch2.orig/include/linux/init_task.h |
--- linux-2.6.18-24etch3.orig/include/linux/init_task.h |
713 |
+++ linux-2.6.18-24etch2/include/linux/init_task.h |
+++ linux-2.6.18-24etch3/include/linux/init_task.h |
714 |
@@ -128,6 +128,8 @@ extern struct group_info init_groups; |
@@ -76,6 +76,14 @@ |
715 |
|
|
716 |
|
extern struct group_info init_groups; |
717 |
|
|
718 |
|
+#ifdef CONFIG_CCSECURITY |
719 |
|
+#define INIT_CCSECURITY \ |
720 |
|
+ .ccs_domain_info = NULL, \ |
721 |
|
+ .ccs_flags = 0, |
722 |
|
+#else |
723 |
|
+#define INIT_CCSECURITY |
724 |
|
+#endif |
725 |
|
+ |
726 |
|
/* |
727 |
|
* INIT_TASK is used to set up the first task table, touch at |
728 |
|
* your own risk!. Base=0, limit=0x1fffff (=2MB) |
729 |
|
@@ -128,6 +136,7 @@ extern struct group_info init_groups; |
730 |
.pi_lock = SPIN_LOCK_UNLOCKED, \ |
.pi_lock = SPIN_LOCK_UNLOCKED, \ |
731 |
INIT_TRACE_IRQFLAGS \ |
INIT_TRACE_IRQFLAGS \ |
732 |
INIT_LOCKDEP \ |
INIT_LOCKDEP \ |
733 |
+ .ccs_domain_info = NULL, \ |
+ INIT_CCSECURITY \ |
|
+ .ccs_flags = 0, \ |
|
734 |
} |
} |
735 |
|
|
736 |
|
|
737 |
--- linux-2.6.18-24etch2.orig/include/linux/sched.h |
--- linux-2.6.18-24etch3.orig/include/linux/sched.h |
738 |
+++ linux-2.6.18-24etch2/include/linux/sched.h |
+++ linux-2.6.18-24etch3/include/linux/sched.h |
739 |
@@ -25,6 +25,8 @@ |
@@ -25,6 +25,8 @@ |
740 |
#define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ |
#define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ |
741 |
#define CLONE_STOPPED 0x02000000 /* Start in stopped state */ |
#define CLONE_STOPPED 0x02000000 /* Start in stopped state */ |
745 |
/* |
/* |
746 |
* Scheduling policies |
* Scheduling policies |
747 |
*/ |
*/ |
748 |
@@ -996,6 +998,8 @@ struct task_struct { |
@@ -996,6 +998,10 @@ struct task_struct { |
749 |
#ifdef CONFIG_TASK_DELAY_ACCT |
#ifdef CONFIG_TASK_DELAY_ACCT |
750 |
struct task_delay_info *delays; |
struct task_delay_info *delays; |
751 |
#endif |
#endif |
752 |
|
+#ifdef CONFIG_CCSECURITY |
753 |
+ struct ccs_domain_info *ccs_domain_info; |
+ struct ccs_domain_info *ccs_domain_info; |
754 |
+ u32 ccs_flags; |
+ u32 ccs_flags; |
755 |
|
+#endif |
756 |
}; |
}; |
757 |
|
|
758 |
static inline pid_t process_group(struct task_struct *tsk) |
static inline pid_t process_group(struct task_struct *tsk) |
759 |
--- linux-2.6.18-24etch2.orig/kernel/compat.c |
--- linux-2.6.18-24etch3.orig/kernel/compat.c |
760 |
+++ linux-2.6.18-24etch2/kernel/compat.c |
+++ linux-2.6.18-24etch3/kernel/compat.c |
761 |
@@ -24,6 +24,7 @@ |
@@ -24,6 +24,7 @@ |
762 |
#include <linux/migrate.h> |
#include <linux/migrate.h> |
763 |
|
|
764 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
765 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
766 |
|
|
767 |
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) |
768 |
{ |
{ |
775 |
|
|
776 |
do_settimeofday(&tv); |
do_settimeofday(&tv); |
777 |
return 0; |
return 0; |
778 |
--- linux-2.6.18-24etch2.orig/kernel/kexec.c |
--- linux-2.6.18-24etch3.orig/kernel/kexec.c |
779 |
+++ linux-2.6.18-24etch2/kernel/kexec.c |
+++ linux-2.6.18-24etch3/kernel/kexec.c |
780 |
@@ -26,6 +26,7 @@ |
@@ -26,6 +26,7 @@ |
781 |
#include <asm/io.h> |
#include <asm/io.h> |
782 |
#include <asm/system.h> |
#include <asm/system.h> |
783 |
#include <asm/semaphore.h> |
#include <asm/semaphore.h> |
784 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
785 |
|
|
786 |
/* Per cpu memory for storing cpu states in case of system crash. */ |
/* Per cpu memory for storing cpu states in case of system crash. */ |
787 |
note_buf_t* crash_notes; |
note_buf_t* crash_notes; |
794 |
|
|
795 |
/* |
/* |
796 |
* Verify we have a legal set of flags |
* Verify we have a legal set of flags |
797 |
--- linux-2.6.18-24etch2.orig/kernel/kmod.c |
--- linux-2.6.18-24etch3.orig/kernel/kmod.c |
798 |
+++ linux-2.6.18-24etch2/kernel/kmod.c |
+++ linux-2.6.18-24etch3/kernel/kmod.c |
799 |
@@ -148,6 +148,9 @@ static int ____call_usermodehelper(void |
@@ -148,6 +148,11 @@ static int ____call_usermodehelper(void |
800 |
/* We can run anywhere, unlike our parent keventd(). */ |
/* We can run anywhere, unlike our parent keventd(). */ |
801 |
set_cpus_allowed(current, CPU_MASK_ALL); |
set_cpus_allowed(current, CPU_MASK_ALL); |
802 |
|
|
803 |
|
+#ifdef CONFIG_CCSECURITY |
804 |
+ current->ccs_domain_info = NULL; |
+ current->ccs_domain_info = NULL; |
805 |
+ current->ccs_flags = 0; |
+ current->ccs_flags = 0; |
806 |
|
+#endif |
807 |
+ |
+ |
808 |
retval = -EPERM; |
retval = -EPERM; |
809 |
if (current->fs->root) |
if (current->fs->root) |
810 |
retval = execve(sub_info->path, sub_info->argv,sub_info->envp); |
retval = execve(sub_info->path, sub_info->argv,sub_info->envp); |
811 |
--- linux-2.6.18-24etch2.orig/kernel/module.c |
--- linux-2.6.18-24etch3.orig/kernel/module.c |
812 |
+++ linux-2.6.18-24etch2/kernel/module.c |
+++ linux-2.6.18-24etch3/kernel/module.c |
813 |
@@ -44,6 +44,7 @@ |
@@ -44,6 +44,7 @@ |
814 |
#include <asm/semaphore.h> |
#include <asm/semaphore.h> |
815 |
#include <asm/cacheflush.h> |
#include <asm/cacheflush.h> |
816 |
#include <linux/license.h> |
#include <linux/license.h> |
817 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
818 |
|
|
819 |
#if 0 |
#if 0 |
820 |
#define DEBUGP printk |
#define DEBUGP printk |
838 |
/* Only one module load at a time, please */ |
/* Only one module load at a time, please */ |
839 |
if (mutex_lock_interruptible(&module_mutex) != 0) |
if (mutex_lock_interruptible(&module_mutex) != 0) |
840 |
return -EINTR; |
return -EINTR; |
841 |
--- linux-2.6.18-24etch2.orig/kernel/ptrace.c |
--- linux-2.6.18-24etch3.orig/kernel/ptrace.c |
842 |
+++ linux-2.6.18-24etch2/kernel/ptrace.c |
+++ linux-2.6.18-24etch3/kernel/ptrace.c |
843 |
@@ -21,6 +21,7 @@ |
@@ -21,6 +21,7 @@ |
844 |
|
|
845 |
#include <asm/pgtable.h> |
#include <asm/pgtable.h> |
846 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
847 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
848 |
|
|
849 |
/* |
/* |
850 |
* ptrace a task: make the debugger its new parent and |
* ptrace a task: make the debugger its new parent and |
857 |
lock_kernel(); |
lock_kernel(); |
858 |
if (request == PTRACE_TRACEME) { |
if (request == PTRACE_TRACEME) { |
859 |
ret = ptrace_traceme(); |
ret = ptrace_traceme(); |
860 |
--- linux-2.6.18-24etch2.orig/kernel/sched.c |
--- linux-2.6.18-24etch3.orig/kernel/sched.c |
861 |
+++ linux-2.6.18-24etch2/kernel/sched.c |
+++ linux-2.6.18-24etch3/kernel/sched.c |
862 |
@@ -55,6 +55,7 @@ |
@@ -55,6 +55,7 @@ |
863 |
#include <asm/tlb.h> |
#include <asm/tlb.h> |
864 |
|
|
865 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
866 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
867 |
|
|
868 |
/* |
/* |
869 |
* Convert user-nice values [ -20 ... 0 ... 19 ] |
* Convert user-nice values [ -20 ... 0 ... 19 ] |
876 |
|
|
877 |
/* |
/* |
878 |
* Setpriority might change our priority at the same moment. |
* Setpriority might change our priority at the same moment. |
879 |
--- linux-2.6.18-24etch2.orig/kernel/signal.c |
--- linux-2.6.18-24etch3.orig/kernel/signal.c |
880 |
+++ linux-2.6.18-24etch2/kernel/signal.c |
+++ linux-2.6.18-24etch3/kernel/signal.c |
881 |
@@ -28,6 +28,7 @@ |
@@ -28,6 +28,7 @@ |
882 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
883 |
#include <asm/siginfo.h> |
#include <asm/siginfo.h> |
884 |
#include "audit.h" /* audit_signal_info() */ |
#include "audit.h" /* audit_signal_info() */ |
885 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
886 |
|
|
887 |
/* |
/* |
888 |
* SLAB caches for signal bits. |
* SLAB caches for signal bits. |
913 |
|
|
914 |
return do_tkill(0, pid, sig); |
return do_tkill(0, pid, sig); |
915 |
} |
} |
916 |
--- linux-2.6.18-24etch2.orig/kernel/sys.c |
@@ -2271,6 +2278,8 @@ sys_rt_sigqueueinfo(int pid, int sig, si |
917 |
+++ linux-2.6.18-24etch2/kernel/sys.c |
if (info.si_code >= 0) |
918 |
|
return -EPERM; |
919 |
|
info.si_signo = sig; |
920 |
|
+ if (ccs_sigqueue_permission(pid, sig)) |
921 |
|
+ return -EPERM; |
922 |
|
|
923 |
|
/* POSIX.1b doesn't mention process groups. */ |
924 |
|
return kill_proc_info(sig, &info, pid); |
925 |
|
--- linux-2.6.18-24etch3.orig/kernel/sys.c |
926 |
|
+++ linux-2.6.18-24etch3/kernel/sys.c |
927 |
@@ -36,6 +36,7 @@ |
@@ -36,6 +36,7 @@ |
928 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
929 |
#include <asm/io.h> |
#include <asm/io.h> |
930 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
931 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
932 |
|
|
933 |
#ifndef SET_UNALIGN_CTL |
#ifndef SET_UNALIGN_CTL |
934 |
# define SET_UNALIGN_CTL(a,b) (-EINVAL) |
# define SET_UNALIGN_CTL(a,b) (-EINVAL) |
970 |
|
|
971 |
down_write(&uts_sem); |
down_write(&uts_sem); |
972 |
errno = -EFAULT; |
errno = -EFAULT; |
973 |
--- linux-2.6.18-24etch2.orig/kernel/sysctl.c |
--- linux-2.6.18-24etch3.orig/kernel/sysctl.c |
974 |
+++ linux-2.6.18-24etch2/kernel/sysctl.c |
+++ linux-2.6.18-24etch3/kernel/sysctl.c |
975 |
@@ -48,6 +48,7 @@ |
@@ -48,6 +48,7 @@ |
976 |
|
|
977 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
978 |
#include <asm/processor.h> |
#include <asm/processor.h> |
979 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
980 |
|
|
981 |
extern int proc_nr_files(ctl_table *table, int write, struct file *filp, |
extern int proc_nr_files(ctl_table *table, int write, struct file *filp, |
982 |
void __user *buffer, size_t *lenp, loff_t *ppos); |
void __user *buffer, size_t *lenp, loff_t *ppos); |
1004 |
error = table->strategy( |
error = table->strategy( |
1005 |
table, name, nlen, |
table, name, nlen, |
1006 |
oldval, oldlenp, |
oldval, oldlenp, |
1007 |
--- linux-2.6.18-24etch2.orig/kernel/time.c |
--- linux-2.6.18-24etch3.orig/kernel/time.c |
1008 |
+++ linux-2.6.18-24etch2/kernel/time.c |
+++ linux-2.6.18-24etch3/kernel/time.c |
1009 |
@@ -39,6 +39,7 @@ |
@@ -39,6 +39,7 @@ |
1010 |
|
|
1011 |
#include <asm/uaccess.h> |
#include <asm/uaccess.h> |
1012 |
#include <asm/unistd.h> |
#include <asm/unistd.h> |
1013 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
1014 |
|
|
1015 |
/* |
/* |
1016 |
* 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 |
1041 |
|
|
1042 |
/* Now we validate the data before disabling interrupts */ |
/* Now we validate the data before disabling interrupts */ |
1043 |
|
|
1044 |
--- linux-2.6.18-24etch2.orig/net/ipv4/inet_connection_sock.c |
--- linux-2.6.18-24etch3.orig/net/ipv4/inet_connection_sock.c |
1045 |
+++ linux-2.6.18-24etch2/net/ipv4/inet_connection_sock.c |
+++ linux-2.6.18-24etch3/net/ipv4/inet_connection_sock.c |
1046 |
@@ -23,6 +23,7 @@ |
@@ -23,6 +23,7 @@ |
1047 |
#include <net/route.h> |
#include <net/route.h> |
1048 |
#include <net/tcp_states.h> |
#include <net/tcp_states.h> |
1049 |
#include <net/xfrm.h> |
#include <net/xfrm.h> |
1050 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
1051 |
|
|
1052 |
#ifdef INET_CSK_DEBUG |
#ifdef INET_CSK_DEBUG |
1053 |
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"; |
1060 |
inet_bind_bucket_for_each(tb, node, &head->chain) |
inet_bind_bucket_for_each(tb, node, &head->chain) |
1061 |
if (tb->port == rover) |
if (tb->port == rover) |
1062 |
goto next; |
goto next; |
1063 |
--- linux-2.6.18-24etch2.orig/net/ipv4/inet_hashtables.c |
--- linux-2.6.18-24etch3.orig/net/ipv4/inet_hashtables.c |
1064 |
+++ linux-2.6.18-24etch2/net/ipv4/inet_hashtables.c |
+++ linux-2.6.18-24etch3/net/ipv4/inet_hashtables.c |
1065 |
@@ -22,6 +22,7 @@ |
@@ -22,6 +22,7 @@ |
1066 |
#include <net/inet_connection_sock.h> |
#include <net/inet_connection_sock.h> |
1067 |
#include <net/inet_hashtables.h> |
#include <net/inet_hashtables.h> |
1068 |
#include <net/ip.h> |
#include <net/ip.h> |
1069 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
1070 |
|
|
1071 |
/* |
/* |
1072 |
* Allocate and initialize a new local port bind bucket. |
* Allocate and initialize a new local port bind bucket. |
1079 |
head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; |
head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; |
1080 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
1081 |
|
|
1082 |
--- linux-2.6.18-24etch2.orig/net/ipv4/raw.c |
--- linux-2.6.18-24etch3.orig/net/ipv4/raw.c |
1083 |
+++ linux-2.6.18-24etch2/net/ipv4/raw.c |
+++ linux-2.6.18-24etch3/net/ipv4/raw.c |
1084 |
@@ -79,6 +79,7 @@ |
@@ -79,6 +79,7 @@ |
1085 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1086 |
#include <linux/netfilter.h> |
#include <linux/netfilter.h> |
1087 |
#include <linux/netfilter_ipv4.h> |
#include <linux/netfilter_ipv4.h> |
1088 |
+#include <linux/tomoyo_socket.h> |
+#include <linux/ccsecurity.h> |
1089 |
|
|
1090 |
struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE]; |
struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE]; |
1091 |
DEFINE_RWLOCK(raw_v4_lock); |
DEFINE_RWLOCK(raw_v4_lock); |
1099 |
|
|
1100 |
copied = skb->len; |
copied = skb->len; |
1101 |
if (len < copied) { |
if (len < copied) { |
1102 |
--- linux-2.6.18-24etch2.orig/net/ipv4/udp.c |
--- linux-2.6.18-24etch3.orig/net/ipv4/udp.c |
1103 |
+++ linux-2.6.18-24etch2/net/ipv4/udp.c |
+++ linux-2.6.18-24etch3/net/ipv4/udp.c |
1104 |
@@ -108,6 +108,8 @@ |
@@ -108,6 +108,7 @@ |
1105 |
#include <net/inet_common.h> |
#include <net/inet_common.h> |
1106 |
#include <net/checksum.h> |
#include <net/checksum.h> |
1107 |
#include <net/xfrm.h> |
#include <net/xfrm.h> |
1108 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo_socket.h> |
|
1109 |
|
|
1110 |
/* |
/* |
1111 |
* Snmp MIB for the UDP layer |
* Snmp MIB for the UDP layer |
1112 |
@@ -146,6 +148,8 @@ static int udp_v4_get_port(struct sock * |
@@ -146,6 +147,8 @@ static int udp_v4_get_port(struct sock * |
1113 |
result = sysctl_local_port_range[0] + |
result = sysctl_local_port_range[0] + |
1114 |
((result - sysctl_local_port_range[0]) & |
((result - sysctl_local_port_range[0]) & |
1115 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1118 |
goto gotit; |
goto gotit; |
1119 |
} |
} |
1120 |
size = 0; |
size = 0; |
1121 |
@@ -162,6 +166,8 @@ static int udp_v4_get_port(struct sock * |
@@ -162,6 +165,8 @@ static int udp_v4_get_port(struct sock * |
1122 |
result = sysctl_local_port_range[0] |
result = sysctl_local_port_range[0] |
1123 |
+ ((result - sysctl_local_port_range[0]) & |
+ ((result - sysctl_local_port_range[0]) & |
1124 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1127 |
if (!udp_lport_inuse(result)) |
if (!udp_lport_inuse(result)) |
1128 |
break; |
break; |
1129 |
} |
} |
1130 |
@@ -796,7 +802,10 @@ try_again: |
@@ -796,7 +801,10 @@ try_again: |
1131 |
skb = skb_recv_datagram(sk, flags, noblock, &err); |
skb = skb_recv_datagram(sk, flags, noblock, &err); |
1132 |
if (!skb) |
if (!skb) |
1133 |
goto out; |
goto out; |
1139 |
copied = skb->len - sizeof(struct udphdr); |
copied = skb->len - sizeof(struct udphdr); |
1140 |
if (copied > len) { |
if (copied > len) { |
1141 |
copied = len; |
copied = len; |
1142 |
--- linux-2.6.18-24etch2.orig/net/ipv6/inet6_hashtables.c |
--- linux-2.6.18-24etch3.orig/net/ipv6/inet6_hashtables.c |
1143 |
+++ linux-2.6.18-24etch2/net/ipv6/inet6_hashtables.c |
+++ linux-2.6.18-24etch3/net/ipv6/inet6_hashtables.c |
1144 |
@@ -21,6 +21,7 @@ |
@@ -21,6 +21,7 @@ |
1145 |
#include <net/inet_hashtables.h> |
#include <net/inet_hashtables.h> |
1146 |
#include <net/inet6_hashtables.h> |
#include <net/inet6_hashtables.h> |
1147 |
#include <net/ip.h> |
#include <net/ip.h> |
1148 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
1149 |
|
|
1150 |
void __inet6_hash(struct inet_hashinfo *hashinfo, |
void __inet6_hash(struct inet_hashinfo *hashinfo, |
1151 |
struct sock *sk) |
struct sock *sk) |
1167 |
head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; |
head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; |
1168 |
spin_lock(&head->lock); |
spin_lock(&head->lock); |
1169 |
|
|
1170 |
--- linux-2.6.18-24etch2.orig/net/ipv6/raw.c |
--- linux-2.6.18-24etch3.orig/net/ipv6/raw.c |
1171 |
+++ linux-2.6.18-24etch2/net/ipv6/raw.c |
+++ linux-2.6.18-24etch3/net/ipv6/raw.c |
1172 |
@@ -56,6 +56,7 @@ |
@@ -56,6 +56,7 @@ |
1173 |
|
|
1174 |
#include <linux/proc_fs.h> |
#include <linux/proc_fs.h> |
1175 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1176 |
+#include <linux/tomoyo_socket.h> |
+#include <linux/ccsecurity.h> |
1177 |
|
|
1178 |
struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE]; |
struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE]; |
1179 |
DEFINE_RWLOCK(raw_v6_lock); |
DEFINE_RWLOCK(raw_v6_lock); |
1187 |
|
|
1188 |
copied = skb->len; |
copied = skb->len; |
1189 |
if (copied > len) { |
if (copied > len) { |
1190 |
--- linux-2.6.18-24etch2.orig/net/ipv6/udp.c |
--- linux-2.6.18-24etch3.orig/net/ipv6/udp.c |
1191 |
+++ linux-2.6.18-24etch2/net/ipv6/udp.c |
+++ linux-2.6.18-24etch3/net/ipv6/udp.c |
1192 |
@@ -58,6 +58,8 @@ |
@@ -58,6 +58,7 @@ |
1193 |
|
|
1194 |
#include <linux/proc_fs.h> |
#include <linux/proc_fs.h> |
1195 |
#include <linux/seq_file.h> |
#include <linux/seq_file.h> |
1196 |
+#include <linux/sakura.h> |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo_socket.h> |
|
1197 |
|
|
1198 |
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly; |
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly; |
1199 |
|
|
1200 |
@@ -88,6 +90,8 @@ static int udp_v6_get_port(struct sock * |
@@ -88,6 +89,8 @@ static int udp_v6_get_port(struct sock * |
1201 |
result = sysctl_local_port_range[0] + |
result = sysctl_local_port_range[0] + |
1202 |
((result - sysctl_local_port_range[0]) & |
((result - sysctl_local_port_range[0]) & |
1203 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1206 |
goto gotit; |
goto gotit; |
1207 |
} |
} |
1208 |
size = 0; |
size = 0; |
1209 |
@@ -104,6 +108,8 @@ static int udp_v6_get_port(struct sock * |
@@ -104,6 +107,8 @@ static int udp_v6_get_port(struct sock * |
1210 |
result = sysctl_local_port_range[0] |
result = sysctl_local_port_range[0] |
1211 |
+ ((result - sysctl_local_port_range[0]) & |
+ ((result - sysctl_local_port_range[0]) & |
1212 |
(UDP_HTABLE_SIZE - 1)); |
(UDP_HTABLE_SIZE - 1)); |
1215 |
if (!udp_lport_inuse(result)) |
if (!udp_lport_inuse(result)) |
1216 |
break; |
break; |
1217 |
} |
} |
1218 |
@@ -237,6 +243,9 @@ try_again: |
@@ -237,6 +242,9 @@ try_again: |
1219 |
skb = skb_recv_datagram(sk, flags, noblock, &err); |
skb = skb_recv_datagram(sk, flags, noblock, &err); |
1220 |
if (!skb) |
if (!skb) |
1221 |
goto out; |
goto out; |
1225 |
|
|
1226 |
copied = skb->len - sizeof(struct udphdr); |
copied = skb->len - sizeof(struct udphdr); |
1227 |
if (copied > len) { |
if (copied > len) { |
1228 |
--- linux-2.6.18-24etch2.orig/net/socket.c |
--- linux-2.6.18-24etch3.orig/net/socket.c |
1229 |
+++ linux-2.6.18-24etch2/net/socket.c |
+++ linux-2.6.18-24etch3/net/socket.c |
1230 |
@@ -94,6 +94,9 @@ |
@@ -94,6 +94,8 @@ |
1231 |
#include <net/sock.h> |
#include <net/sock.h> |
1232 |
#include <linux/netfilter.h> |
#include <linux/netfilter.h> |
1233 |
|
|
1234 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
|
+#include <linux/tomoyo_socket.h> |
|
1235 |
+ |
+ |
1236 |
static int sock_no_open(struct inode *irrelevant, struct file *dontcare); |
static int sock_no_open(struct inode *irrelevant, struct file *dontcare); |
1237 |
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf, |
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf, |
1238 |
size_t size, loff_t pos); |
size_t size, loff_t pos); |
1239 |
@@ -590,9 +593,12 @@ static inline int __sock_sendmsg(struct |
@@ -590,9 +592,12 @@ static inline int __sock_sendmsg(struct |
1240 |
si->size = size; |
si->size = size; |
1241 |
|
|
1242 |
err = security_socket_sendmsg(sock, msg, size); |
err = security_socket_sendmsg(sock, msg, size); |
1250 |
return sock->ops->sendmsg(iocb, sock, msg, size); |
return sock->ops->sendmsg(iocb, sock, msg, size); |
1251 |
} |
} |
1252 |
|
|
1253 |
@@ -1149,6 +1155,8 @@ static int __sock_create(int family, int |
@@ -1149,6 +1154,8 @@ static int __sock_create(int family, int |
1254 |
} |
} |
1255 |
|
|
1256 |
err = security_socket_create(family, type, protocol, kern); |
err = security_socket_create(family, type, protocol, kern); |
1259 |
if (err) |
if (err) |
1260 |
return err; |
return err; |
1261 |
|
|
1262 |
@@ -1343,6 +1351,11 @@ asmlinkage long sys_bind(int fd, struct |
@@ -1343,6 +1350,11 @@ asmlinkage long sys_bind(int fd, struct |
1263 |
if((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) { |
if((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) { |
1264 |
err = security_socket_bind(sock, (struct sockaddr *)address, addrlen); |
err = security_socket_bind(sock, (struct sockaddr *)address, addrlen); |
1265 |
if (!err) |
if (!err) |
1271 |
err = sock->ops->bind(sock, |
err = sock->ops->bind(sock, |
1272 |
(struct sockaddr *)address, addrlen); |
(struct sockaddr *)address, addrlen); |
1273 |
} |
} |
1274 |
@@ -1371,6 +1384,8 @@ asmlinkage long sys_listen(int fd, int b |
@@ -1371,6 +1383,8 @@ asmlinkage long sys_listen(int fd, int b |
1275 |
|
|
1276 |
err = security_socket_listen(sock, backlog); |
err = security_socket_listen(sock, backlog); |
1277 |
if (!err) |
if (!err) |
1280 |
err = sock->ops->listen(sock, backlog); |
err = sock->ops->listen(sock, backlog); |
1281 |
|
|
1282 |
fput_light(sock->file, fput_needed); |
fput_light(sock->file, fput_needed); |
1283 |
@@ -1434,6 +1449,11 @@ asmlinkage long sys_accept(int fd, struc |
@@ -1434,6 +1448,11 @@ asmlinkage long sys_accept(int fd, struc |
1284 |
if (err < 0) |
if (err < 0) |
1285 |
goto out_fd; |
goto out_fd; |
1286 |
|
|
1292 |
if (upeer_sockaddr) { |
if (upeer_sockaddr) { |
1293 |
if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) { |
if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) { |
1294 |
err = -ECONNABORTED; |
err = -ECONNABORTED; |
1295 |
@@ -1488,9 +1508,11 @@ asmlinkage long sys_connect(int fd, stru |
@@ -1488,9 +1507,11 @@ asmlinkage long sys_connect(int fd, stru |
1296 |
goto out_put; |
goto out_put; |
1297 |
|
|
1298 |
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen); |
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen); |
1305 |
err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, |
err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, |
1306 |
sock->file->f_flags); |
sock->file->f_flags); |
1307 |
out_put: |
out_put: |
1308 |
--- linux-2.6.18-24etch2.orig/net/unix/af_unix.c |
--- linux-2.6.18-24etch3.orig/net/unix/af_unix.c |
1309 |
+++ linux-2.6.18-24etch2/net/unix/af_unix.c |
+++ linux-2.6.18-24etch3/net/unix/af_unix.c |
1310 |
@@ -116,6 +116,7 @@ |
@@ -116,6 +116,7 @@ |
1311 |
#include <linux/mount.h> |
#include <linux/mount.h> |
1312 |
#include <net/checksum.h> |
#include <net/checksum.h> |
1313 |
#include <linux/security.h> |
#include <linux/security.h> |
1314 |
+#include <linux/tomoyo.h> |
+#include <linux/ccsecurity.h> |
1315 |
|
|
1316 |
int sysctl_unix_max_dgram_qlen = 10; |
int sysctl_unix_max_dgram_qlen = 10; |
1317 |
|
|
1319 |
*/ |
*/ |
1320 |
mode = S_IFSOCK | |
mode = S_IFSOCK | |
1321 |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask); |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask); |
1322 |
+ err = ccs_check_mknod_permission(nd.dentry->d_inode, dentry, |
+ err = ccs_mknod_permission(nd.dentry->d_inode, dentry, nd.mnt, |
1323 |
+ nd.mnt, mode, 0); |
+ mode, 0); |
1324 |
+ if (!err) |
+ if (!err) |
1325 |
err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); |
err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); |
1326 |
if (err) |
if (err) |
1327 |
goto out_mknod_dput; |
goto out_mknod_dput; |
1328 |
|
--- linux-2.6.18-24etch3.orig/security/Kconfig |
1329 |
|
+++ linux-2.6.18-24etch3/security/Kconfig |
1330 |
|
@@ -107,5 +107,7 @@ config SECURITY_SECLVL |
1331 |
|
|
1332 |
|
source security/selinux/Kconfig |
1333 |
|
|
1334 |
|
+source security/ccsecurity/Kconfig |
1335 |
|
+ |
1336 |
|
endmenu |
1337 |
|
|
1338 |
|
--- linux-2.6.18-24etch3.orig/security/Makefile |
1339 |
|
+++ linux-2.6.18-24etch3/security/Makefile |
1340 |
|
@@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin |
1341 |
|
obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o |
1342 |
|
obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o |
1343 |
|
obj-$(CONFIG_SECURITY_SECLVL) += seclvl.o |
1344 |
|
+ |
1345 |
|
+subdir-$(CONFIG_CCSECURITY)+= ccsecurity |
1346 |
|
+obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o |