オープンソース・ソフトウェアの開発とダウンロード

Subversion リポジトリの参照

Annotation of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2866 - (hide annotations) (download) (as text)
Fri Aug 7 14:47:14 2009 UTC (14 years, 9 months ago) by kumaneko
Original Path: branches/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff
File MIME type: text/x-diff
File size: 37662 byte(s)


1 kumaneko 1498 This is TOMOYO Linux patch for VineLinux 4.2.
2    
3 kumaneko 2587 Source code for this patch is http://updates.vinelinux.org/Vine-4.2/updates/SRPMS/kernel-2.6.16-76.49vl4.src.rpm
4 kumaneko 1498 ---
5 kumaneko 2796 arch/alpha/kernel/ptrace.c | 3 +++
6     arch/ia64/ia32/sys_ia32.c | 3 +++
7     arch/ia64/kernel/ptrace.c | 3 +++
8     arch/m32r/kernel/ptrace.c | 3 +++
9     arch/mips/kernel/ptrace32.c | 3 +++
10     arch/powerpc/kernel/ptrace32.c | 3 +++
11     arch/s390/kernel/ptrace.c | 3 +++
12     arch/sparc/kernel/ptrace.c | 5 +++++
13     arch/sparc64/kernel/ptrace.c | 5 +++++
14     arch/x86_64/ia32/ptrace32.c | 3 +++
15     fs/attr.c | 5 +++++
16     fs/compat.c | 9 ++++++++-
17     fs/exec.c | 12 +++++++++++-
18     fs/fcntl.c | 5 +++++
19     fs/ioctl.c | 5 +++++
20     fs/namei.c | 38 ++++++++++++++++++++++++++++++++++++++
21 kumaneko 2866 fs/namespace.c | 25 ++++++++++++++++++++++++-
22 kumaneko 2859 fs/open.c | 15 ++++++++++++++-
23 kumaneko 2796 fs/proc/proc_misc.c | 1 +
24     include/linux/init_task.h | 2 ++
25     include/linux/sched.h | 4 ++++
26     kernel/compat.c | 3 +++
27     kernel/kexec.c | 3 +++
28     kernel/kmod.c | 3 +++
29     kernel/module.c | 7 +++++--
30     kernel/ptrace.c | 3 +++
31     kernel/sched.c | 3 +++
32 kumaneko 2851 kernel/signal.c | 7 +++++++
33 kumaneko 2796 kernel/sys.c | 11 +++++++++++
34     kernel/sysctl.c | 11 +++++++++++
35     kernel/time.c | 7 +++++++
36     net/ipv4/inet_connection_sock.c | 3 +++
37     net/ipv4/inet_hashtables.c | 3 +++
38     net/ipv4/raw.c | 4 ++++
39 kumaneko 2859 net/ipv4/udp.c | 10 +++++++++-
40 kumaneko 2796 net/ipv6/inet6_hashtables.c | 5 ++++-
41     net/ipv6/raw.c | 4 ++++
42 kumaneko 2859 net/ipv6/udp.c | 8 ++++++++
43     net/socket.c | 25 ++++++++++++++++++++++---
44 kumaneko 2796 net/unix/af_unix.c | 4 ++++
45 kumaneko 2858 security/Kconfig | 2 ++
46     security/Makefile | 3 +++
47 kumaneko 2866 42 files changed, 273 insertions(+), 11 deletions(-)
48 kumaneko 1498
49 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/alpha/kernel/ptrace.c
50     +++ linux-2.6.16-76.49vl4/arch/alpha/kernel/ptrace.c
51 kumaneko 2796 @@ -20,6 +20,7 @@
52 kumaneko 1498 #include <asm/pgtable.h>
53     #include <asm/system.h>
54     #include <asm/fpu.h>
55 kumaneko 2859 +#include <linux/ccsecurity.h>
56 kumaneko 1498
57     #include "proto.h"
58    
59 kumaneko 2796 @@ -268,6 +269,8 @@ do_sys_ptrace(long request, long pid, lo
60 kumaneko 1498 unsigned long tmp;
61     size_t copied;
62     long ret;
63 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
64 kumaneko 1498 + return -EPERM;
65    
66     lock_kernel();
67     DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",
68 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/ia64/ia32/sys_ia32.c
69     +++ linux-2.6.16-76.49vl4/arch/ia64/ia32/sys_ia32.c
70 kumaneko 2796 @@ -58,6 +58,7 @@
71 kumaneko 1498 #include <asm/types.h>
72     #include <asm/uaccess.h>
73     #include <asm/unistd.h>
74 kumaneko 2859 +#include <linux/ccsecurity.h>
75 kumaneko 1498
76     #include "ia32priv.h"
77    
78 kumaneko 2796 @@ -1755,6 +1756,8 @@ sys32_ptrace (int request, pid_t pid, un
79 kumaneko 1498 struct task_struct *child;
80     unsigned int value, tmp;
81     long i, ret;
82 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
83 kumaneko 1498 + return -EPERM;
84    
85     lock_kernel();
86     if (request == PTRACE_TRACEME) {
87 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/ia64/kernel/ptrace.c
88     +++ linux-2.6.16-76.49vl4/arch/ia64/kernel/ptrace.c
89 kumaneko 2796 @@ -29,6 +29,7 @@
90 kumaneko 1498 #ifdef CONFIG_PERFMON
91     #include <asm/perfmon.h>
92     #endif
93 kumaneko 2859 +#include <linux/ccsecurity.h>
94 kumaneko 1498
95     #include "entry.h"
96    
97 kumaneko 2796 @@ -1418,6 +1419,8 @@ sys_ptrace (long request, pid_t pid, uns
98 kumaneko 1498 struct task_struct *child;
99     struct switch_stack *sw;
100     long ret;
101 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
102 kumaneko 1498 + return -EPERM;
103    
104     lock_kernel();
105     ret = -EPERM;
106 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/m32r/kernel/ptrace.c
107     +++ linux-2.6.16-76.49vl4/arch/m32r/kernel/ptrace.c
108 kumaneko 2796 @@ -33,6 +33,7 @@
109 kumaneko 1498 #include <asm/system.h>
110     #include <asm/processor.h>
111     #include <asm/mmu_context.h>
112 kumaneko 2859 +#include <linux/ccsecurity.h>
113 kumaneko 1498
114     /*
115     * This routine will get a word off of the process kernel stack.
116 kumaneko 2796 @@ -743,6 +744,8 @@ asmlinkage long sys_ptrace(long request,
117 kumaneko 1498 {
118     struct task_struct *child;
119     int ret;
120 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
121 kumaneko 1498 + return -EPERM;
122    
123     lock_kernel();
124     if (request == PTRACE_TRACEME) {
125 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/mips/kernel/ptrace32.c
126     +++ linux-2.6.16-76.49vl4/arch/mips/kernel/ptrace32.c
127 kumaneko 2796 @@ -35,6 +35,7 @@
128 kumaneko 1498 #include <asm/system.h>
129     #include <asm/uaccess.h>
130     #include <asm/bootinfo.h>
131 kumaneko 2859 +#include <linux/ccsecurity.h>
132 kumaneko 1498
133     int ptrace_getregs (struct task_struct *child, __s64 __user *data);
134     int ptrace_setregs (struct task_struct *child, __s64 __user *data);
135 kumaneko 2796 @@ -50,6 +51,8 @@ asmlinkage int sys32_ptrace(int request,
136 kumaneko 1498 {
137     struct task_struct *child;
138     int ret;
139 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
140 kumaneko 1498 + return -EPERM;
141    
142     #if 0
143     printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
144 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/powerpc/kernel/ptrace32.c
145     +++ linux-2.6.16-76.49vl4/arch/powerpc/kernel/ptrace32.c
146 kumaneko 2796 @@ -33,6 +33,7 @@
147 kumaneko 1498 #include <asm/page.h>
148     #include <asm/pgtable.h>
149     #include <asm/system.h>
150 kumaneko 2859 +#include <linux/ccsecurity.h>
151 kumaneko 1498
152     #include "ptrace-common.h"
153    
154 kumaneko 2796 @@ -46,6 +47,8 @@ long compat_sys_ptrace(int request, int
155 kumaneko 1498 {
156     struct task_struct *child;
157     int ret;
158 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
159 kumaneko 1498 + return -EPERM;
160    
161     lock_kernel();
162     if (request == PTRACE_TRACEME) {
163 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/s390/kernel/ptrace.c
164     +++ linux-2.6.16-76.49vl4/arch/s390/kernel/ptrace.c
165 kumaneko 2796 @@ -41,6 +41,7 @@
166 kumaneko 1498 #include <asm/system.h>
167     #include <asm/uaccess.h>
168     #include <asm/unistd.h>
169 kumaneko 2859 +#include <linux/ccsecurity.h>
170 kumaneko 1498
171     #ifdef CONFIG_COMPAT
172     #include "compat_ptrace.h"
173 kumaneko 2796 @@ -711,6 +712,8 @@ sys_ptrace(long request, long pid, long
174 kumaneko 1498 struct task_struct *child;
175     int ret;
176    
177 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
178 kumaneko 1498 + return -EPERM;
179     lock_kernel();
180     if (request == PTRACE_TRACEME) {
181     ret = ptrace_traceme();
182 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/sparc/kernel/ptrace.c
183     +++ linux-2.6.16-76.49vl4/arch/sparc/kernel/ptrace.c
184 kumaneko 2796 @@ -23,6 +23,7 @@
185 kumaneko 1498 #include <asm/pgtable.h>
186     #include <asm/system.h>
187     #include <asm/uaccess.h>
188 kumaneko 2859 +#include <linux/ccsecurity.h>
189 kumaneko 1498
190     #define MAGIC_CONSTANT 0x80000000
191    
192 kumaneko 2796 @@ -267,6 +268,10 @@ asmlinkage void do_ptrace(struct pt_regs
193 kumaneko 1498 unsigned long addr2 = regs->u_regs[UREG_I4];
194     struct task_struct *child;
195     int ret;
196 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE)) {
197 kumaneko 1498 + pt_error_return(regs, EPERM);
198     + return;
199     + }
200    
201     lock_kernel();
202     #ifdef DEBUG_PTRACE
203 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/sparc64/kernel/ptrace.c
204     +++ linux-2.6.16-76.49vl4/arch/sparc64/kernel/ptrace.c
205 kumaneko 2796 @@ -32,6 +32,7 @@
206 kumaneko 1498 #include <asm/spitfire.h>
207     #include <asm/page.h>
208     #include <asm/cpudata.h>
209 kumaneko 2859 +#include <linux/ccsecurity.h>
210 kumaneko 1498
211     /* Returning from ptrace is a bit tricky because the syscall return
212     * low level code assumes any value returned which is negative and
213 kumaneko 2796 @@ -173,6 +174,10 @@ asmlinkage void do_ptrace(struct pt_regs
214 kumaneko 1498 unsigned long addr2 = regs->u_regs[UREG_I4];
215     struct task_struct *child;
216     int ret;
217 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE)) {
218 kumaneko 1498 + pt_error_return(regs, EPERM);
219     + return;
220     + }
221    
222     if (test_thread_flag(TIF_32BIT)) {
223     addr &= 0xffffffffUL;
224 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/arch/x86_64/ia32/ptrace32.c
225     +++ linux-2.6.16-76.49vl4/arch/x86_64/ia32/ptrace32.c
226 kumaneko 2796 @@ -27,6 +27,7 @@
227 kumaneko 1498 #include <asm/debugreg.h>
228     #include <asm/i387.h>
229     #include <asm/fpu32.h>
230 kumaneko 2859 +#include <linux/ccsecurity.h>
231 kumaneko 1498
232     /*
233     * Determines which flags the user has access to [1 = access, 0 = no access].
234 kumaneko 2796 @@ -206,6 +207,8 @@ asmlinkage long sys32_ptrace(long reques
235 kumaneko 1498 void __user *datap = compat_ptr(data);
236     int ret;
237     __u32 val;
238 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
239 kumaneko 1498 + return -EPERM;
240    
241     switch (request) {
242     default:
243 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/attr.c
244     +++ linux-2.6.16-76.49vl4/fs/attr.c
245 kumaneko 2796 @@ -15,6 +15,7 @@
246 kumaneko 1498 #include <linux/fcntl.h>
247     #include <linux/quotaops.h>
248     #include <linux/security.h>
249 kumaneko 2859 +#include <linux/ccsecurity.h>
250 kumaneko 1498
251     /* Taken over from the old code... */
252    
253 kumaneko 2796 @@ -146,11 +147,15 @@ int notify_change(struct dentry * dentry
254 kumaneko 1498 if (inode->i_op && inode->i_op->setattr) {
255     error = security_inode_setattr(dentry, attr);
256 kumaneko 2796 if (!error)
257     + error = ccs_check_setattr_permission(dentry, attr);
258 kumaneko 2794 + if (!error)
259 kumaneko 1498 error = inode->i_op->setattr(dentry, attr);
260     } else {
261     error = inode_change_ok(inode, attr);
262     if (!error)
263     error = security_inode_setattr(dentry, attr);
264 kumaneko 2794 + if (!error)
265     + error = ccs_check_setattr_permission(dentry, attr);
266 kumaneko 1498 if (!error) {
267     if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
268     (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
269 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/compat.c
270     +++ linux-2.6.16-76.49vl4/fs/compat.c
271 kumaneko 2796 @@ -52,6 +52,7 @@
272 kumaneko 1498 #include <asm/uaccess.h>
273     #include <asm/mmu_context.h>
274     #include <asm/ioctls.h>
275 kumaneko 2859 +#include <linux/ccsecurity.h>
276 kumaneko 1498
277     extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
278    
279 kumaneko 2796 @@ -381,6 +382,8 @@ asmlinkage long compat_sys_ioctl(unsigne
280 kumaneko 2279
281     /* RED-PEN how should LSM module know it's handling 32bit? */
282     error = security_file_ioctl(filp, cmd, arg);
283     + if (!error)
284     + error = ccs_check_ioctl_permission(filp, cmd, arg);
285     if (error)
286     goto out_fput;
287    
288 kumaneko 2796 @@ -405,6 +408,10 @@ asmlinkage long compat_sys_ioctl(unsigne
289 kumaneko 1498 /*FALL THROUGH*/
290    
291     default:
292 kumaneko 2282 + if (!ccs_capable(CCS_SYS_IOCTL)) {
293 kumaneko 1498 + error = -EPERM;
294     + goto out_fput;
295     + }
296     if (filp->f_op && filp->f_op->compat_ioctl) {
297     error = filp->f_op->compat_ioctl(filp, cmd, arg);
298     if (error != -ENOIOCTLCMD)
299 kumaneko 2796 @@ -1532,7 +1539,7 @@ int compat_do_execve(char * filename,
300 kumaneko 1498 if (retval < 0)
301     goto out;
302    
303     - retval = search_binary_handler(bprm, regs);
304 kumaneko 2300 + retval = ccs_search_binary_handler(bprm, regs);
305 kumaneko 1498 if (retval >= 0) {
306     free_arg_pages(bprm);
307    
308 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/exec.c
309     +++ linux-2.6.16-76.49vl4/fs/exec.c
310 kumaneko 2796 @@ -57,6 +57,8 @@
311 kumaneko 1498 #include <linux/kmod.h>
312     #endif
313    
314 kumaneko 2859 +#include <linux/ccsecurity.h>
315 kumaneko 1498 +
316     int core_uses_pid;
317     char core_pattern[65] = "core";
318     int suid_dumpable = 0;
319 kumaneko 2796 @@ -139,6 +141,10 @@ asmlinkage long sys_uselib(const char __
320 kumaneko 1498 if (error)
321     goto exit;
322    
323 kumaneko 2306 + error = ccs_check_uselib_permission(nd.dentry, nd.mnt);
324 kumaneko 1498 + if (error)
325     + goto exit;
326     +
327     file = nameidata_to_filp(&nd, O_RDONLY);
328     error = PTR_ERR(file);
329     if (IS_ERR(file))
330 kumaneko 2796 @@ -488,6 +494,9 @@ struct file *open_exec(const char *name)
331 kumaneko 1498 int err = vfs_permission(&nd, MAY_EXEC);
332     if (!err && !(inode->i_mode & 0111))
333     err = -EACCES;
334 kumaneko 2306 + if (!err)
335     + err = ccs_check_open_exec_permission(nd.dentry,
336     + nd.mnt);
337 kumaneko 1498 file = ERR_PTR(err);
338     if (!err) {
339     file = nameidata_to_filp(&nd, O_RDONLY);
340 kumaneko 2796 @@ -1201,7 +1210,8 @@ int do_execve(char * filename,
341 kumaneko 1498 if (retval < 0)
342     goto out;
343    
344     - retval = search_binary_handler(bprm,regs);
345 kumaneko 2300 + retval = ccs_search_binary_handler(bprm, regs);
346 kumaneko 1498 +
347     if (retval >= 0) {
348     free_arg_pages(bprm);
349    
350 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/fcntl.c
351     +++ linux-2.6.16-76.49vl4/fs/fcntl.c
352 kumaneko 2796 @@ -22,6 +22,7 @@
353 kumaneko 1498 #include <asm/poll.h>
354     #include <asm/siginfo.h>
355     #include <asm/uaccess.h>
356 kumaneko 2859 +#include <linux/ccsecurity.h>
357 kumaneko 1498
358     void fastcall set_close_on_exec(unsigned int fd, int flag)
359     {
360 kumaneko 2796 @@ -215,6 +216,10 @@ static int setfl(int fd, struct file * f
361 kumaneko 1498 if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode))
362     return -EPERM;
363    
364     + if (((arg ^ filp->f_flags) & O_APPEND) &&
365     + ccs_check_rewrite_permission(filp))
366     + return -EPERM;
367     +
368     /* O_NOATIME can only be set by the owner or superuser */
369     if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
370     if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
371 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/ioctl.c
372     +++ linux-2.6.16-76.49vl4/fs/ioctl.c
373 kumaneko 2796 @@ -16,6 +16,7 @@
374 kumaneko 1498
375     #include <asm/uaccess.h>
376     #include <asm/ioctls.h>
377 kumaneko 2859 +#include <linux/ccsecurity.h>
378 kumaneko 1498
379     static long do_ioctl(struct file *filp, unsigned int cmd,
380     unsigned long arg)
381 kumaneko 2796 @@ -24,6 +25,8 @@ static long do_ioctl(struct file *filp,
382 kumaneko 1498
383     if (!filp->f_op)
384     goto out;
385 kumaneko 2282 + if (!ccs_capable(CCS_SYS_IOCTL))
386 kumaneko 1498 + return -EPERM;
387    
388     if (filp->f_op->unlocked_ioctl) {
389     error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
390 kumaneko 2796 @@ -168,6 +171,8 @@ asmlinkage long sys_ioctl(unsigned int f
391 kumaneko 2279 goto out;
392    
393     error = security_file_ioctl(filp, cmd, arg);
394     + if (!error)
395     + error = ccs_check_ioctl_permission(filp, cmd, arg);
396     if (error)
397     goto out_fput;
398    
399 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/namei.c
400     +++ linux-2.6.16-76.49vl4/fs/namei.c
401 kumaneko 2796 @@ -37,6 +37,8 @@
402 kumaneko 1498
403     #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
404    
405 kumaneko 2859 +#include <linux/ccsecurity.h>
406 kumaneko 1498 +
407     /* [Feb-1997 T. Schoebel-Theuer]
408     * Fundamental changes in the pathname lookup mechanisms (namei)
409     * were necessary because of omirr. The reason is that omirr needs
410 kumaneko 2796 @@ -1539,6 +1541,11 @@ int may_open(struct nameidata *nd, int a
411 kumaneko 1498 if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
412     return -EPERM;
413    
414     + /* includes O_APPEND and O_TRUNC checks */
415     + error = ccs_check_open_permission(dentry, nd->mnt, flag);
416     + if (error)
417     + return error;
418     +
419     /*
420     * Ensure there are no outstanding leases on the file.
421     */
422 kumaneko 2796 @@ -1570,6 +1577,7 @@ int may_open(struct nameidata *nd, int a
423 kumaneko 1498 return 0;
424     }
425    
426 kumaneko 2859 +#include <linux/ccsecurity_vfs.h>
427 kumaneko 1498 /*
428     * open_namei()
429     *
430 kumaneko 2796 @@ -1653,6 +1661,9 @@ do_last:
431 kumaneko 2297 if (!path.dentry->d_inode) {
432     if (!IS_POSIXACL(dir->d_inode))
433     mode &= ~current->fs->umask;
434     + error = ccs_check_mknod_permission(dir->d_inode, path.dentry,
435 kumaneko 2299 + nd->mnt, mode, 0);
436 kumaneko 2297 + if (!error)
437     error = vfs_create(dir->d_inode, path.dentry, mode, nd);
438     mutex_unlock(&dir->d_inode->i_mutex);
439     dput(nd->dentry);
440 kumaneko 2796 @@ -1847,6 +1858,10 @@ asmlinkage long sys_mknodat(int dfd, con
441 kumaneko 2297 if (!IS_POSIXACL(nd.dentry->d_inode))
442     mode &= ~current->fs->umask;
443     if (!IS_ERR(dentry)) {
444 kumaneko 2299 + error = ccs_check_mknod_permission(nd.dentry->d_inode, dentry,
445     + nd.mnt, mode,
446 kumaneko 2297 + new_decode_dev(dev));
447     + if (!error)
448     switch (mode & S_IFMT) {
449     case 0: case S_IFREG:
450 kumaneko 1498 error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
451 kumaneko 2796 @@ -1920,6 +1935,10 @@ asmlinkage long sys_mkdirat(int dfd, con
452 kumaneko 1498 if (!IS_ERR(dentry)) {
453     if (!IS_POSIXACL(nd.dentry->d_inode))
454     mode &= ~current->fs->umask;
455 kumaneko 2297 + error = ccs_check_mkdir_permission(nd.dentry->d_inode,
456     + dentry, nd.mnt,
457     + mode);
458 kumaneko 1498 + if (!error)
459     error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
460     dput(dentry);
461     }
462 kumaneko 2796 @@ -2028,6 +2047,9 @@ static long do_rmdir(int dfd, const char
463 kumaneko 1498 dentry = lookup_hash(&nd);
464     error = PTR_ERR(dentry);
465     if (!IS_ERR(dentry)) {
466 kumaneko 2297 + error = ccs_check_rmdir_permission(nd.dentry->d_inode, dentry,
467     + nd.mnt);
468 kumaneko 1498 + if (!error)
469     error = vfs_rmdir(nd.dentry->d_inode, dentry);
470     dput(dentry);
471     }
472 kumaneko 2796 @@ -2108,6 +2130,9 @@ static long do_unlinkat(int dfd, const c
473 kumaneko 1498 inode = dentry->d_inode;
474     if (inode)
475     atomic_inc(&inode->i_count);
476 kumaneko 2297 + error = ccs_check_unlink_permission(nd.dentry->d_inode, dentry,
477     + nd.mnt);
478     + if (!error)
479 kumaneko 1498 error = vfs_unlink(nd.dentry->d_inode, dentry);
480     exit2:
481     dput(dentry);
482 kumaneko 2796 @@ -2186,6 +2211,10 @@ asmlinkage long sys_symlinkat(const char
483 kumaneko 1498 dentry = lookup_create(&nd, 0);
484     error = PTR_ERR(dentry);
485     if (!IS_ERR(dentry)) {
486 kumaneko 2297 + error = ccs_check_symlink_permission(nd.dentry->d_inode,
487     + dentry, nd.mnt,
488     + from);
489 kumaneko 1498 + if (!error)
490     error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
491     dput(dentry);
492     }
493 kumaneko 2796 @@ -2278,6 +2307,10 @@ asmlinkage long sys_linkat(int olddfd, c
494 kumaneko 1498 new_dentry = lookup_create(&nd, 0);
495     error = PTR_ERR(new_dentry);
496     if (!IS_ERR(new_dentry)) {
497 kumaneko 2297 + error = ccs_check_link_permission(old_nd.dentry,
498     + nd.dentry->d_inode,
499     + new_dentry, nd.mnt);
500 kumaneko 1498 + if (!error)
501     error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
502     dput(new_dentry);
503     }
504 kumaneko 2796 @@ -2504,6 +2537,11 @@ static int do_rename(int olddfd, const c
505 kumaneko 1498 if (new_dentry == trap)
506     goto exit5;
507    
508 kumaneko 2297 + error = ccs_check_rename_permission(old_dir->d_inode, old_dentry,
509     + new_dir->d_inode, new_dentry,
510     + newnd.mnt);
511     + if (!error)
512 kumaneko 1498 +
513     error = vfs_rename(old_dir->d_inode, old_dentry,
514     new_dir->d_inode, new_dentry);
515     exit5:
516 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/namespace.c
517     +++ linux-2.6.16-76.49vl4/fs/namespace.c
518 kumaneko 2859 @@ -26,6 +26,7 @@
519 kumaneko 1498 #include <asm/uaccess.h>
520     #include <asm/unistd.h>
521     #include "pnode.h"
522 kumaneko 2859 +#include <linux/ccsecurity.h>
523 kumaneko 1498
524     extern int __init init_rootfs(void);
525    
526 kumaneko 2859 @@ -509,6 +510,9 @@ static int do_umount(struct vfsmount *mn
527 kumaneko 1498 if (retval)
528     return retval;
529    
530     + if (ccs_may_umount(mnt))
531     + return -EPERM;
532     +
533     /*
534     * Allow userspace to request a mountpoint be expired rather than
535     * unmounting unconditionally. Unmount only happens if:
536 kumaneko 2859 @@ -597,6 +601,8 @@ asmlinkage long sys_umount(char __user *
537 kumaneko 1498 {
538     struct nameidata nd;
539     int retval;
540 kumaneko 2282 + if (!ccs_capable(CCS_SYS_UMOUNT))
541 kumaneko 1498 + return -EPERM;
542    
543     retval = __user_walk(name, LOOKUP_FOLLOW, &nd);
544     if (retval)
545 kumaneko 2859 @@ -884,6 +890,9 @@ static int do_loopback(struct nameidata
546 kumaneko 1498
547     if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
548     goto out;
549     + err = -EPERM;
550     + if (ccs_may_mount(nd))
551     + goto out;
552    
553     err = -ENOMEM;
554     if (recurse)
555 kumaneko 2859 @@ -968,7 +977,9 @@ static int do_move_mount(struct nameidat
556 kumaneko 1498 err = -EINVAL;
557     if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
558     goto out;
559     -
560     + err = -EPERM;
561     + if (ccs_may_umount(old_nd.mnt) || ccs_may_mount(nd))
562     + goto out;
563     err = -ENOENT;
564     mutex_lock(&nd->dentry->d_inode->i_mutex);
565     if (IS_DEADDIR(nd->dentry->d_inode))
566 kumaneko 2859 @@ -1070,6 +1081,9 @@ int do_add_mount(struct vfsmount *newmnt
567 kumaneko 1498 err = -EINVAL;
568     if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode))
569     goto unlock;
570     + err = -EPERM;
571     + if (ccs_may_mount(nd))
572     + goto unlock;
573    
574     newmnt->mnt_flags = mnt_flags;
575     if ((err = graft_tree(newmnt, nd)))
576 kumaneko 2866 @@ -1287,6 +1301,11 @@ long do_mount(char *dev_name, char *dir_
577 kumaneko 1498 if (data_page)
578     ((char *)data_page)[PAGE_SIZE - 1] = 0;
579    
580     + retval = ccs_check_mount_permission(dev_name, dir_name, type_page,
581     + &flags);
582     + if (retval)
583     + return retval;
584     +
585     /* Separate the per-mountpoint flags */
586     if (flags & MS_NOSUID)
587     mnt_flags |= MNT_NOSUID;
588 kumaneko 2866 @@ -1585,6 +1604,8 @@ asmlinkage long sys_pivot_root(const cha
589 kumaneko 1498
590     if (!capable(CAP_SYS_ADMIN))
591     return -EPERM;
592 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PIVOT_ROOT))
593 kumaneko 1498 + return -EPERM;
594    
595     lock_kernel();
596    
597 kumaneko 2866 @@ -1601,6 +1622,8 @@ asmlinkage long sys_pivot_root(const cha
598 kumaneko 1498 goto out1;
599    
600     error = security_sb_pivotroot(&old_nd, &new_nd);
601     + if (!error)
602     + error = ccs_check_pivot_root_permission(&old_nd, &new_nd);
603     if (error) {
604     path_release(&old_nd);
605     goto out1;
606 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/open.c
607     +++ linux-2.6.16-76.49vl4/fs/open.c
608 kumaneko 2859 @@ -30,6 +30,8 @@
609 kumaneko 1498
610     #include <asm/unistd.h>
611    
612 kumaneko 2859 +#include <linux/ccsecurity.h>
613 kumaneko 1498 +
614     int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
615     {
616     int retval = -ENODEV;
617 kumaneko 2859 @@ -269,6 +271,8 @@ static long do_sys_truncate(const char _
618 kumaneko 1498 if (error)
619     goto dput_and_out;
620    
621 kumaneko 2297 + error = ccs_check_truncate_permission(nd.dentry, nd.mnt, length, 0);
622 kumaneko 1498 + if (!error)
623     error = locks_verify_truncate(inode, NULL, length);
624     if (!error) {
625     DQUOT_INIT(inode);
626 kumaneko 2859 @@ -321,7 +325,10 @@ static long do_sys_ftruncate(unsigned in
627 kumaneko 1498 error = -EPERM;
628     if (IS_APPEND(inode))
629     goto out_putf;
630     -
631 kumaneko 2297 + error = ccs_check_truncate_permission(dentry, file->f_vfsmnt, length,
632     + 0);
633 kumaneko 1498 + if (error)
634     + goto out_putf;
635     error = locks_verify_truncate(inode, file, length);
636     if (!error)
637     error = do_truncate(dentry, length, 0, file);
638 kumaneko 2859 @@ -610,6 +617,10 @@ asmlinkage long sys_chroot(const char __
639 kumaneko 1498 error = -EPERM;
640     if (!capable(CAP_SYS_CHROOT))
641     goto dput_and_out;
642 kumaneko 2282 + if (!ccs_capable(CCS_SYS_CHROOT))
643 kumaneko 1498 + goto dput_and_out;
644     + if (ccs_check_chroot_permission(&nd))
645     + goto dput_and_out;
646    
647     set_fs_root(current->fs, nd.mnt, nd.dentry);
648     set_fs_altroot();
649 kumaneko 2859 @@ -1192,6 +1203,8 @@ EXPORT_SYMBOL(sys_close);
650 kumaneko 1498 */
651     asmlinkage long sys_vhangup(void)
652     {
653 kumaneko 2282 + if (!ccs_capable(CCS_SYS_VHANGUP))
654 kumaneko 1498 + return -EPERM;
655     if (capable(CAP_SYS_TTY_CONFIG)) {
656     tty_vhangup(current->signal->tty);
657     return 0;
658 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/fs/proc/proc_misc.c
659     +++ linux-2.6.16-76.49vl4/fs/proc/proc_misc.c
660 kumaneko 2796 @@ -682,4 +682,5 @@ void __init proc_misc_init(void)
661 kumaneko 1498 if (entry)
662     entry->proc_fops = &proc_sysrq_trigger_operations;
663     #endif
664 kumaneko 2851 + printk(KERN_INFO "Hook version: 2.6.16-76.49vl4 2009/08/05\n");
665 kumaneko 1498 }
666 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/include/linux/init_task.h
667     +++ linux-2.6.16-76.49vl4/include/linux/init_task.h
668 kumaneko 2796 @@ -121,6 +121,8 @@ extern struct group_info init_groups;
669 kumaneko 1498 .journal_info = NULL, \
670     .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
671     .fs_excl = ATOMIC_INIT(0), \
672 kumaneko 2282 + .ccs_domain_info = NULL, \
673     + .ccs_flags = 0, \
674 kumaneko 1498 }
675    
676    
677 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/include/linux/sched.h
678     +++ linux-2.6.16-76.49vl4/include/linux/sched.h
679 kumaneko 2796 @@ -40,6 +40,8 @@
680 kumaneko 1498
681     struct exec_domain;
682    
683 kumaneko 2282 +struct ccs_domain_info;
684 kumaneko 1498 +
685     /*
686     * cloning flags:
687     */
688 kumaneko 2796 @@ -873,6 +875,8 @@ struct task_struct {
689 kumaneko 1498 struct rcu_head rcu;
690 kumaneko 2405
691     struct list_head *scm_work_list;
692 kumaneko 2282 + struct ccs_domain_info *ccs_domain_info;
693     + u32 ccs_flags;
694 kumaneko 1498 };
695    
696     static inline pid_t process_group(struct task_struct *tsk)
697 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/compat.c
698     +++ linux-2.6.16-76.49vl4/kernel/compat.c
699 kumaneko 2796 @@ -23,6 +23,7 @@
700 kumaneko 1498 #include <linux/security.h>
701    
702     #include <asm/uaccess.h>
703 kumaneko 2859 +#include <linux/ccsecurity.h>
704 kumaneko 1498
705     int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
706     {
707 kumaneko 2796 @@ -864,6 +865,8 @@ asmlinkage long compat_sys_stime(compat_
708 kumaneko 1498 err = security_settime(&tv, NULL);
709     if (err)
710     return err;
711 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
712 kumaneko 1498 + return -EPERM;
713    
714     do_settimeofday(&tv);
715     return 0;
716 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/kexec.c
717     +++ linux-2.6.16-76.49vl4/kernel/kexec.c
718 kumaneko 2796 @@ -26,6 +26,7 @@
719 kumaneko 1498 #include <asm/io.h>
720     #include <asm/system.h>
721     #include <asm/semaphore.h>
722 kumaneko 2859 +#include <linux/ccsecurity.h>
723 kumaneko 1498
724     /* Per cpu memory for storing cpu states in case of system crash. */
725     note_buf_t* crash_notes;
726 kumaneko 2796 @@ -922,6 +923,8 @@ asmlinkage long sys_kexec_load(unsigned
727 kumaneko 1498 /* We only trust the superuser with rebooting the system. */
728     if (!capable(CAP_SYS_BOOT))
729     return -EPERM;
730 kumaneko 2282 + if (!ccs_capable(CCS_SYS_KEXEC_LOAD))
731 kumaneko 1498 + return -EPERM;
732    
733     /*
734     * Verify we have a legal set of flags
735 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/kmod.c
736     +++ linux-2.6.16-76.49vl4/kernel/kmod.c
737 kumaneko 2796 @@ -150,6 +150,9 @@ static int ____call_usermodehelper(void
738 kumaneko 1498 /* We can run anywhere, unlike our parent keventd(). */
739     set_cpus_allowed(current, CPU_MASK_ALL);
740    
741 kumaneko 2282 + current->ccs_domain_info = NULL;
742     + current->ccs_flags = 0;
743 kumaneko 1498 +
744     retval = -EPERM;
745     if (current->fs->root)
746     retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
747 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/module.c
748     +++ linux-2.6.16-76.49vl4/kernel/module.c
749 kumaneko 2796 @@ -42,6 +42,7 @@
750 kumaneko 1498 #include <asm/uaccess.h>
751     #include <asm/semaphore.h>
752     #include <asm/cacheflush.h>
753 kumaneko 2859 +#include <linux/ccsecurity.h>
754 kumaneko 1498
755     #if 0
756     #define DEBUGP printk
757 kumaneko 2796 @@ -578,7 +579,8 @@ sys_delete_module(const char __user *nam
758 kumaneko 1498
759     if (!capable(CAP_SYS_MODULE))
760     return -EPERM;
761     -
762 kumaneko 2282 + if (!ccs_capable(CCS_USE_KERNEL_MODULE))
763 kumaneko 1498 + return -EPERM;
764     if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
765     return -EFAULT;
766     name[MODULE_NAME_LEN-1] = '\0';
767 kumaneko 2796 @@ -1931,7 +1933,8 @@ sys_init_module(void __user *umod,
768 kumaneko 1498 /* Must have permission */
769     if (!capable(CAP_SYS_MODULE))
770     return -EPERM;
771     -
772 kumaneko 2282 + if (!ccs_capable(CCS_USE_KERNEL_MODULE))
773 kumaneko 1498 + return -EPERM;
774     /* Only one module load at a time, please */
775     if (down_interruptible(&module_mutex) != 0)
776     return -EINTR;
777 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/ptrace.c
778     +++ linux-2.6.16-76.49vl4/kernel/ptrace.c
779 kumaneko 2796 @@ -21,6 +21,7 @@
780 kumaneko 1498
781     #include <asm/pgtable.h>
782     #include <asm/uaccess.h>
783 kumaneko 2859 +#include <linux/ccsecurity.h>
784 kumaneko 1498
785     /*
786     * ptrace a task: make the debugger its new parent and
787 kumaneko 2796 @@ -495,6 +496,8 @@ asmlinkage long sys_ptrace(long request,
788 kumaneko 1498 /*
789     * This lock_kernel fixes a subtle race with suid exec
790     */
791 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
792 kumaneko 1498 + return -EPERM;
793     lock_kernel();
794     if (request == PTRACE_TRACEME) {
795     ret = ptrace_traceme();
796 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/sched.c
797     +++ linux-2.6.16-76.49vl4/kernel/sched.c
798 kumaneko 2796 @@ -52,6 +52,7 @@
799 kumaneko 1498 #include <asm/tlb.h>
800    
801     #include <asm/unistd.h>
802 kumaneko 2859 +#include <linux/ccsecurity.h>
803 kumaneko 1498
804     /*
805     * Convert user-nice values [ -20 ... 0 ... 19 ]
806 kumaneko 2796 @@ -3545,6 +3546,8 @@ asmlinkage long sys_nice(int increment)
807 kumaneko 1498 {
808     int retval;
809     long nice;
810 kumaneko 2282 + if (!ccs_capable(CCS_SYS_NICE))
811 kumaneko 1498 + return -EPERM;
812    
813     /*
814     * Setpriority might change our priority at the same moment.
815 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/signal.c
816     +++ linux-2.6.16-76.49vl4/kernel/signal.c
817 kumaneko 2796 @@ -30,6 +30,7 @@
818 kumaneko 1498 #include <asm/uaccess.h>
819     #include <asm/unistd.h>
820     #include <asm/siginfo.h>
821 kumaneko 2859 +#include <linux/ccsecurity.h>
822 kumaneko 1498
823     /*
824     * SLAB caches for signal bits.
825 kumaneko 2851 @@ -2336,6 +2337,8 @@ asmlinkage long
826 kumaneko 1498 sys_kill(int pid, int sig)
827     {
828     struct siginfo info;
829 kumaneko 2851 + if (ccs_kill_permission(pid, sig))
830 kumaneko 1498 + return -EPERM;
831    
832     info.si_signo = sig;
833     info.si_errno = 0;
834 kumaneko 2851 @@ -2394,6 +2397,8 @@ asmlinkage long sys_tgkill(int tgid, int
835 kumaneko 1498 /* This is only valid for single tasks */
836     if (pid <= 0 || tgid <= 0)
837     return -EINVAL;
838 kumaneko 2851 + if (ccs_tgkill_permission(tgid, pid, sig))
839 kumaneko 1498 + return -EPERM;
840    
841     return do_tkill(tgid, pid, sig);
842     }
843 kumaneko 2851 @@ -2407,6 +2412,8 @@ sys_tkill(int pid, int sig)
844 kumaneko 1498 /* This is only valid for single tasks */
845     if (pid <= 0)
846     return -EINVAL;
847 kumaneko 2851 + if (ccs_tkill_permission(pid, sig))
848 kumaneko 1498 + return -EPERM;
849    
850     return do_tkill(0, pid, sig);
851     }
852 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/sys.c
853     +++ linux-2.6.16-76.49vl4/kernel/sys.c
854 kumaneko 2796 @@ -38,6 +38,7 @@
855 kumaneko 1498 #include <asm/uaccess.h>
856     #include <asm/io.h>
857     #include <asm/unistd.h>
858 kumaneko 2859 +#include <linux/ccsecurity.h>
859 kumaneko 1498
860     #ifndef SET_UNALIGN_CTL
861     # define SET_UNALIGN_CTL(a,b) (-EINVAL)
862 kumaneko 2796 @@ -269,6 +270,10 @@ asmlinkage long sys_setpriority(int whic
863 kumaneko 1498
864     if (which > 2 || which < 0)
865     goto out;
866 kumaneko 2282 + if (!ccs_capable(CCS_SYS_NICE)) {
867 kumaneko 1498 + error = -EPERM;
868     + goto out;
869     + }
870    
871     /* normalize: avoid signed division (rounding problems) */
872     error = -ESRCH;
873 kumaneko 2796 @@ -496,6 +501,8 @@ asmlinkage long sys_reboot(int magic1, i
874 kumaneko 1498 magic2 != LINUX_REBOOT_MAGIC2B &&
875     magic2 != LINUX_REBOOT_MAGIC2C))
876     return -EINVAL;
877 kumaneko 2282 + if (!ccs_capable(CCS_SYS_REBOOT))
878 kumaneko 1498 + return -EPERM;
879    
880     /* Instead of trying to make the power_off code look like
881     * halt when pm_power_off is not set do it the easy way.
882 kumaneko 2796 @@ -1533,6 +1540,8 @@ asmlinkage long sys_sethostname(char __u
883 kumaneko 1498 return -EPERM;
884     if (len < 0 || len > __NEW_UTS_LEN)
885     return -EINVAL;
886 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETHOSTNAME))
887 kumaneko 1498 + return -EPERM;
888     down_write(&uts_sem);
889     errno = -EFAULT;
890     if (!copy_from_user(tmp, name, len)) {
891 kumaneko 2796 @@ -1578,6 +1587,8 @@ asmlinkage long sys_setdomainname(char _
892 kumaneko 1498 return -EPERM;
893     if (len < 0 || len > __NEW_UTS_LEN)
894     return -EINVAL;
895 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETHOSTNAME))
896 kumaneko 1498 + return -EPERM;
897    
898     down_write(&uts_sem);
899     errno = -EFAULT;
900 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/sysctl.c
901     +++ linux-2.6.16-76.49vl4/kernel/sysctl.c
902 kumaneko 2796 @@ -49,6 +49,7 @@
903 kumaneko 1498
904     #include <asm/uaccess.h>
905     #include <asm/processor.h>
906 kumaneko 2859 +#include <linux/ccsecurity.h>
907 kumaneko 1498
908     extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
909     void __user *buffer, size_t *lenp, loff_t *ppos);
910 kumaneko 2796 @@ -1133,6 +1134,9 @@ int do_sysctl(int __user *name, int nlen
911 kumaneko 1498
912     spin_unlock(&sysctl_lock);
913    
914 kumaneko 2298 + error = ccs_parse_table(name, nlen, oldval, newval,
915 kumaneko 1498 + head->ctl_table);
916     + if (!error)
917     error = parse_table(name, nlen, oldval, oldlenp,
918     newval, newlen, head->ctl_table,
919     &context);
920 kumaneko 2796 @@ -1205,6 +1209,13 @@ repeat:
921 kumaneko 1498 if (ctl_perm(table, 001))
922     return -EPERM;
923     if (table->strategy) {
924     + int op = 0;
925     + if (oldval)
926     + op |= 004;
927     + if (newval)
928     + op |= 002;
929     + if (ctl_perm(table, op))
930     + return -EPERM;
931     error = table->strategy(
932     table, name, nlen,
933     oldval, oldlenp,
934 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/kernel/time.c
935     +++ linux-2.6.16-76.49vl4/kernel/time.c
936 kumaneko 2796 @@ -39,6 +39,7 @@
937 kumaneko 1498
938     #include <asm/uaccess.h>
939     #include <asm/unistd.h>
940 kumaneko 2859 +#include <linux/ccsecurity.h>
941 kumaneko 1498
942     /*
943     * The timezone where the local system is located. Used as a default by some
944 kumaneko 2796 @@ -91,6 +92,8 @@ asmlinkage long sys_stime(time_t __user
945 kumaneko 1498 err = security_settime(&tv, NULL);
946     if (err)
947     return err;
948 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
949 kumaneko 1498 + return -EPERM;
950    
951     do_settimeofday(&tv);
952     return 0;
953 kumaneko 2796 @@ -161,6 +164,8 @@ int do_sys_settimeofday(struct timespec
954 kumaneko 1498 error = security_settime(tv, tz);
955     if (error)
956     return error;
957 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
958 kumaneko 1498 + return -EPERM;
959    
960     if (tz) {
961     /* SMP safe, global irq locking makes it work. */
962 kumaneko 2796 @@ -239,6 +244,8 @@ int do_adjtimex(struct timex *txc)
963 kumaneko 1498 /* In order to modify anything, you gotta be super-user! */
964     if (txc->modes && !capable(CAP_SYS_TIME))
965     return -EPERM;
966 kumaneko 2282 + if (txc->modes && !ccs_capable(CCS_SYS_SETTIME))
967 kumaneko 1498 + return -EPERM;
968    
969     /* Now we validate the data before disabling interrupts */
970    
971 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv4/inet_connection_sock.c
972     +++ linux-2.6.16-76.49vl4/net/ipv4/inet_connection_sock.c
973 kumaneko 2796 @@ -24,6 +24,7 @@
974 kumaneko 1498 #include <net/route.h>
975     #include <net/tcp_states.h>
976     #include <net/xfrm.h>
977 kumaneko 2859 +#include <linux/ccsecurity.h>
978 kumaneko 1498
979     #ifdef INET_CSK_DEBUG
980     const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
981 kumaneko 2796 @@ -88,6 +89,8 @@ int inet_csk_get_port(struct inet_hashin
982 kumaneko 1498 do {
983     head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)];
984     spin_lock(&head->lock);
985 kumaneko 2299 + if (ccs_lport_reserved(rover))
986 kumaneko 1498 + goto next;
987     inet_bind_bucket_for_each(tb, node, &head->chain)
988     if (tb->port == rover)
989     goto next;
990 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv4/inet_hashtables.c
991     +++ linux-2.6.16-76.49vl4/net/ipv4/inet_hashtables.c
992 kumaneko 2796 @@ -23,6 +23,7 @@
993 kumaneko 1498 #include <net/inet_connection_sock.h>
994     #include <net/inet_hashtables.h>
995     #include <net/ip.h>
996 kumaneko 2859 +#include <linux/ccsecurity.h>
997 kumaneko 1498
998     /*
999     * Allocate and initialize a new local port bind bucket.
1000 kumaneko 2796 @@ -268,6 +269,8 @@ int inet_hash_connect(struct inet_timewa
1001 kumaneko 1498 local_bh_disable();
1002     for (i = 1; i <= range; i++) {
1003     port = low + (i + offset) % range;
1004 kumaneko 2299 + if (ccs_lport_reserved(port))
1005 kumaneko 1498 + continue;
1006     head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1007     spin_lock(&head->lock);
1008    
1009 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv4/raw.c
1010     +++ linux-2.6.16-76.49vl4/net/ipv4/raw.c
1011 kumaneko 2796 @@ -79,6 +79,7 @@
1012 kumaneko 2459 #include <linux/seq_file.h>
1013     #include <linux/netfilter.h>
1014     #include <linux/netfilter_ipv4.h>
1015 kumaneko 2859 +#include <linux/ccsecurity.h>
1016 kumaneko 2459
1017     struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
1018     DEFINE_RWLOCK(raw_v4_lock);
1019 kumaneko 2796 @@ -592,6 +593,9 @@ static int raw_recvmsg(struct kiocb *ioc
1020 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1021     if (!skb)
1022     goto out;
1023     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1024     + if (err)
1025     + goto out;
1026    
1027     copied = skb->len;
1028     if (len < copied) {
1029 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv4/udp.c
1030     +++ linux-2.6.16-76.49vl4/net/ipv4/udp.c
1031 kumaneko 2859 @@ -109,6 +109,7 @@
1032 kumaneko 1498 #include <net/inet_common.h>
1033     #include <net/checksum.h>
1034     #include <net/xfrm.h>
1035 kumaneko 2859 +#include <linux/ccsecurity.h>
1036 kumaneko 1498
1037     /*
1038     * Snmp MIB for the UDP layer
1039 kumaneko 2859 @@ -147,6 +148,8 @@ static int udp_v4_get_port(struct sock *
1040 kumaneko 1498 result = sysctl_local_port_range[0] +
1041     ((result - sysctl_local_port_range[0]) &
1042     (UDP_HTABLE_SIZE - 1));
1043 kumaneko 2299 + if (ccs_lport_reserved(result))
1044 kumaneko 1498 + continue;
1045     goto gotit;
1046     }
1047     size = 0;
1048 kumaneko 2859 @@ -163,6 +166,8 @@ static int udp_v4_get_port(struct sock *
1049 kumaneko 1498 result = sysctl_local_port_range[0]
1050     + ((result - sysctl_local_port_range[0]) &
1051     (UDP_HTABLE_SIZE - 1));
1052 kumaneko 2299 + if (ccs_lport_reserved(result))
1053 kumaneko 1498 + continue;
1054     if (!udp_lport_inuse(result))
1055     break;
1056     }
1057 kumaneko 2859 @@ -797,7 +802,10 @@ try_again:
1058 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1059     if (!skb)
1060     goto out;
1061     -
1062     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1063     + if (err)
1064     + goto out;
1065     +
1066     copied = skb->len - sizeof(struct udphdr);
1067     if (copied > len) {
1068     copied = len;
1069 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv6/inet6_hashtables.c
1070     +++ linux-2.6.16-76.49vl4/net/ipv6/inet6_hashtables.c
1071 kumaneko 2796 @@ -22,6 +22,7 @@
1072 kumaneko 1498 #include <net/inet_hashtables.h>
1073     #include <net/inet6_hashtables.h>
1074     #include <net/ip.h>
1075 kumaneko 2859 +#include <linux/ccsecurity.h>
1076 kumaneko 1498
1077     struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
1078     const struct in6_addr *daddr,
1079 kumaneko 2796 @@ -93,7 +94,7 @@ static int __inet6_check_established(str
1080 kumaneko 1498 const struct in6_addr *saddr = &np->daddr;
1081     const int dif = sk->sk_bound_dev_if;
1082     const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
1083     - const unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr,
1084     + const unsigned int hash = inet6_ehashfn(daddr, lport, saddr,
1085     inet->dport);
1086     struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
1087     struct sock *sk2;
1088 kumaneko 2796 @@ -187,6 +188,8 @@ int inet6_hash_connect(struct inet_timew
1089 kumaneko 1498 local_bh_disable();
1090     for (i = 1; i <= range; i++) {
1091     port = low + (i + offset) % range;
1092 kumaneko 2299 + if (ccs_lport_reserved(port))
1093 kumaneko 1498 + continue;
1094     head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1095     spin_lock(&head->lock);
1096    
1097 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv6/raw.c
1098     +++ linux-2.6.16-76.49vl4/net/ipv6/raw.c
1099 kumaneko 2796 @@ -56,6 +56,7 @@
1100 kumaneko 2459
1101     #include <linux/proc_fs.h>
1102     #include <linux/seq_file.h>
1103 kumaneko 2859 +#include <linux/ccsecurity.h>
1104 kumaneko 2459
1105     struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
1106     DEFINE_RWLOCK(raw_v6_lock);
1107 kumaneko 2796 @@ -387,6 +388,9 @@ static int rawv6_recvmsg(struct kiocb *i
1108 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1109     if (!skb)
1110     goto out;
1111     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1112     + if (err)
1113     + goto out;
1114    
1115     copied = skb->len;
1116     if (copied > len) {
1117 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/ipv6/udp.c
1118     +++ linux-2.6.16-76.49vl4/net/ipv6/udp.c
1119 kumaneko 2859 @@ -59,6 +59,7 @@
1120 kumaneko 1498
1121     #include <linux/proc_fs.h>
1122     #include <linux/seq_file.h>
1123 kumaneko 2859 +#include <linux/ccsecurity.h>
1124 kumaneko 1498
1125     DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
1126    
1127 kumaneko 2859 @@ -89,6 +90,8 @@ static int udp_v6_get_port(struct sock *
1128 kumaneko 1498 result = sysctl_local_port_range[0] +
1129     ((result - sysctl_local_port_range[0]) &
1130     (UDP_HTABLE_SIZE - 1));
1131 kumaneko 2299 + if (ccs_lport_reserved(result))
1132 kumaneko 1498 + continue;
1133     goto gotit;
1134     }
1135     size = 0;
1136 kumaneko 2859 @@ -105,6 +108,8 @@ static int udp_v6_get_port(struct sock *
1137 kumaneko 1498 result = sysctl_local_port_range[0]
1138     + ((result - sysctl_local_port_range[0]) &
1139     (UDP_HTABLE_SIZE - 1));
1140 kumaneko 2299 + if (ccs_lport_reserved(result))
1141 kumaneko 1498 + continue;
1142     if (!udp_lport_inuse(result))
1143     break;
1144     }
1145 kumaneko 2859 @@ -238,6 +243,9 @@ try_again:
1146 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1147     if (!skb)
1148     goto out;
1149     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1150     + if (err)
1151     + goto out;
1152    
1153     copied = skb->len - sizeof(struct udphdr);
1154     if (copied > len) {
1155 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/socket.c
1156     +++ linux-2.6.16-76.49vl4/net/socket.c
1157 kumaneko 2859 @@ -97,6 +97,8 @@
1158 kumaneko 1498 #include <net/sock.h>
1159     #include <linux/netfilter.h>
1160    
1161 kumaneko 2859 +#include <linux/ccsecurity.h>
1162 kumaneko 1498 +
1163     static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
1164     static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
1165     size_t size, loff_t pos);
1166 kumaneko 2859 @@ -544,9 +546,12 @@ static inline int __sock_sendmsg(struct
1167 kumaneko 2805 si->size = size;
1168    
1169 kumaneko 1498 err = security_socket_sendmsg(sock, msg, size);
1170 kumaneko 2805 + if (!err)
1171     + err = ccs_socket_sendmsg_permission(sock, (struct sockaddr *)
1172     + msg->msg_name,
1173     + msg->msg_namelen);
1174 kumaneko 1498 if (err)
1175     return err;
1176     -
1177     return sock->ops->sendmsg(iocb, sock, msg, size);
1178     }
1179    
1180 kumaneko 2859 @@ -1103,6 +1108,8 @@ static int __sock_create(int family, int
1181 kumaneko 1498 }
1182    
1183     err = security_socket_create(family, type, protocol, kern);
1184 kumaneko 2805 + if (!err)
1185     + err = ccs_socket_create_permission(family, type, protocol);
1186 kumaneko 1498 if (err)
1187     return err;
1188 kumaneko 2805
1189 kumaneko 2859 @@ -1299,6 +1306,10 @@ asmlinkage long sys_bind(int fd, struct
1190 kumaneko 1498 sockfd_put(sock);
1191     return err;
1192     }
1193     + err = ccs_socket_bind_permission(sock,
1194     + (struct sockaddr *)
1195     + address, addrlen);
1196     + if (!err)
1197     err = sock->ops->bind(sock, (struct sockaddr *)address, addrlen);
1198     }
1199     sockfd_put(sock);
1200 kumaneko 2859 @@ -1329,7 +1340,8 @@ asmlinkage long sys_listen(int fd, int b
1201 kumaneko 1498 sockfd_put(sock);
1202     return err;
1203     }
1204     -
1205     + err = ccs_socket_listen_permission(sock);
1206     + if (!err)
1207     err=sock->ops->listen(sock, backlog);
1208     sockfd_put(sock);
1209     }
1210 kumaneko 2859 @@ -1380,6 +1392,11 @@ asmlinkage long sys_accept(int fd, struc
1211 kumaneko 1498 if (err < 0)
1212     goto out_release;
1213    
1214     + if (ccs_socket_accept_permission(newsock,
1215     + (struct sockaddr *) address)) {
1216     + err = -ECONNABORTED; /* Hope less harmful than -EPERM. */
1217     + goto out_release;
1218     + }
1219     if (upeer_sockaddr) {
1220     if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) {
1221     err = -ECONNABORTED;
1222 kumaneko 2859 @@ -1433,9 +1450,11 @@ asmlinkage long sys_connect(int fd, stru
1223 kumaneko 2805 goto out_put;
1224    
1225 kumaneko 1498 err = security_socket_connect(sock, (struct sockaddr *)address, addrlen);
1226 kumaneko 2805 + if (!err)
1227     + err = ccs_socket_connect_permission(sock, (struct sockaddr *)
1228     + address, addrlen);
1229 kumaneko 1498 if (err)
1230     goto out_put;
1231     -
1232     err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1233     sock->file->f_flags);
1234     out_put:
1235 kumaneko 2587 --- linux-2.6.16-76.49vl4.orig/net/unix/af_unix.c
1236     +++ linux-2.6.16-76.49vl4/net/unix/af_unix.c
1237 kumaneko 2796 @@ -117,6 +117,7 @@
1238 kumaneko 1498 #include <linux/mount.h>
1239     #include <net/checksum.h>
1240     #include <linux/security.h>
1241 kumaneko 2859 +#include <linux/ccsecurity.h>
1242 kumaneko 1498
1243     int sysctl_unix_max_dgram_qlen = 10;
1244    
1245 kumaneko 2796 @@ -782,6 +783,9 @@ static int unix_bind(struct socket *sock
1246 kumaneko 1498 */
1247     mode = S_IFSOCK |
1248     (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
1249 kumaneko 2297 + err = ccs_check_mknod_permission(nd.dentry->d_inode, dentry,
1250     + nd.mnt, mode, 0);
1251 kumaneko 1498 + if (!err)
1252     err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
1253     if (err)
1254     goto out_mknod_dput;
1255 kumaneko 2858 --- linux-2.6.16-76.49vl4.orig/security/Kconfig
1256     +++ linux-2.6.16-76.49vl4/security/Kconfig
1257     @@ -101,5 +101,7 @@ config SECURITY_SECLVL
1258    
1259     source security/selinux/Kconfig
1260    
1261     +source security/ccsecurity/Kconfig
1262     +
1263     endmenu
1264    
1265     --- linux-2.6.16-76.49vl4.orig/security/Makefile
1266     +++ linux-2.6.16-76.49vl4/security/Makefile
1267     @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin
1268     obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
1269     obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o
1270     obj-$(CONFIG_SECURITY_SECLVL) += seclvl.o
1271     +
1272     +subdir-$(CONFIG_CCSECURITY)+= ccsecurity
1273     +obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26