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

Subversion リポジトリの参照

Annotation of /branches/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2922 - (hide annotations) (download) (as text)
Wed Aug 19 04:26:56 2009 UTC (14 years, 9 months ago) by kumaneko
File MIME type: text/x-diff
File size: 39537 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 kumaneko 2922 fs/fcntl.c | 4 ++++
19 kumaneko 2796 fs/ioctl.c | 5 +++++
20 kumaneko 2922 fs/namei.c | 34 ++++++++++++++++++++++++++++++++++
21     fs/namespace.c | 24 +++++++++++++++++++++++-
22     fs/open.c | 29 ++++++++++++++++++++++++++++-
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 2869 kernel/signal.c | 9 +++++++++
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 2922 42 files changed, 283 insertions(+), 11 deletions(-)
48 kumaneko 1498
49 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/arch/alpha/kernel/ptrace.c
50     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/ia64/ia32/sys_ia32.c
69     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/ia64/kernel/ptrace.c
88     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/m32r/kernel/ptrace.c
107     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/mips/kernel/ptrace32.c
126     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/powerpc/kernel/ptrace32.c
145     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/s390/kernel/ptrace.c
164     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/sparc/kernel/ptrace.c
183     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/sparc64/kernel/ptrace.c
204     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/arch/x86_64/ia32/ptrace32.c
225     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/fs/attr.c
244     +++ linux-2.6.16-76.51vl4/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 kumaneko 2922 + error = ccs_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 kumaneko 2922 + error = ccs_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 2882 --- linux-2.6.16-76.51vl4.orig/fs/compat.c
270     +++ linux-2.6.16-76.51vl4/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 2882 --- linux-2.6.16-76.51vl4.orig/fs/exec.c
309     +++ linux-2.6.16-76.51vl4/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 2922 + error = ccs_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 kumaneko 2922 + err = ccs_open_exec_permission(nd.dentry,
336 kumaneko 2306 + 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 2882 --- linux-2.6.16-76.51vl4.orig/fs/fcntl.c
351     +++ linux-2.6.16-76.51vl4/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 2922 @@ -215,6 +216,9 @@ 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 kumaneko 2922 + if (((arg ^ filp->f_flags) & O_APPEND) && ccs_rewrite_permission(filp))
365 kumaneko 1498 + return -EPERM;
366     +
367     /* O_NOATIME can only be set by the owner or superuser */
368     if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
369     if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
370 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/fs/ioctl.c
371     +++ linux-2.6.16-76.51vl4/fs/ioctl.c
372 kumaneko 2796 @@ -16,6 +16,7 @@
373 kumaneko 1498
374     #include <asm/uaccess.h>
375     #include <asm/ioctls.h>
376 kumaneko 2859 +#include <linux/ccsecurity.h>
377 kumaneko 1498
378     static long do_ioctl(struct file *filp, unsigned int cmd,
379     unsigned long arg)
380 kumaneko 2796 @@ -24,6 +25,8 @@ static long do_ioctl(struct file *filp,
381 kumaneko 1498
382     if (!filp->f_op)
383     goto out;
384 kumaneko 2282 + if (!ccs_capable(CCS_SYS_IOCTL))
385 kumaneko 1498 + return -EPERM;
386    
387     if (filp->f_op->unlocked_ioctl) {
388     error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
389 kumaneko 2796 @@ -168,6 +171,8 @@ asmlinkage long sys_ioctl(unsigned int f
390 kumaneko 2279 goto out;
391    
392     error = security_file_ioctl(filp, cmd, arg);
393     + if (!error)
394 kumaneko 2922 + error = ccs_ioctl_permission(filp, cmd, arg);
395 kumaneko 2279 if (error)
396     goto out_fput;
397    
398 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/fs/namei.c
399     +++ linux-2.6.16-76.51vl4/fs/namei.c
400 kumaneko 2796 @@ -37,6 +37,8 @@
401 kumaneko 1498
402     #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
403    
404 kumaneko 2859 +#include <linux/ccsecurity.h>
405 kumaneko 1498 +
406     /* [Feb-1997 T. Schoebel-Theuer]
407     * Fundamental changes in the pathname lookup mechanisms (namei)
408     * were necessary because of omirr. The reason is that omirr needs
409 kumaneko 2796 @@ -1539,6 +1541,11 @@ int may_open(struct nameidata *nd, int a
410 kumaneko 1498 if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
411     return -EPERM;
412    
413     + /* includes O_APPEND and O_TRUNC checks */
414 kumaneko 2922 + error = ccs_open_permission(dentry, nd->mnt, flag);
415 kumaneko 1498 + if (error)
416     + return error;
417     +
418     /*
419     * Ensure there are no outstanding leases on the file.
420     */
421 kumaneko 2796 @@ -1570,6 +1577,7 @@ int may_open(struct nameidata *nd, int a
422 kumaneko 1498 return 0;
423     }
424    
425 kumaneko 2859 +#include <linux/ccsecurity_vfs.h>
426 kumaneko 1498 /*
427     * open_namei()
428     *
429 kumaneko 2796 @@ -1653,6 +1661,9 @@ do_last:
430 kumaneko 2297 if (!path.dentry->d_inode) {
431     if (!IS_POSIXACL(dir->d_inode))
432     mode &= ~current->fs->umask;
433 kumaneko 2922 + error = ccs_mknod_permission(dir->d_inode, path.dentry,
434     + nd->mnt, mode, 0);
435 kumaneko 2297 + if (!error)
436     error = vfs_create(dir->d_inode, path.dentry, mode, nd);
437     mutex_unlock(&dir->d_inode->i_mutex);
438     dput(nd->dentry);
439 kumaneko 2922 @@ -1847,6 +1858,9 @@ asmlinkage long sys_mknodat(int dfd, con
440 kumaneko 2297 if (!IS_POSIXACL(nd.dentry->d_inode))
441     mode &= ~current->fs->umask;
442     if (!IS_ERR(dentry)) {
443 kumaneko 2922 + error = ccs_mknod_permission(nd.dentry->d_inode, dentry,
444     + nd.mnt, mode, dev);
445 kumaneko 2297 + if (!error)
446     switch (mode & S_IFMT) {
447     case 0: case S_IFREG:
448 kumaneko 1498 error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
449 kumaneko 2922 @@ -1920,6 +1934,9 @@ asmlinkage long sys_mkdirat(int dfd, con
450 kumaneko 1498 if (!IS_ERR(dentry)) {
451     if (!IS_POSIXACL(nd.dentry->d_inode))
452     mode &= ~current->fs->umask;
453 kumaneko 2922 + error = ccs_mkdir_permission(nd.dentry->d_inode,
454     + dentry, nd.mnt, mode);
455 kumaneko 1498 + if (!error)
456     error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
457     dput(dentry);
458     }
459 kumaneko 2922 @@ -2028,6 +2045,9 @@ static long do_rmdir(int dfd, const char
460 kumaneko 1498 dentry = lookup_hash(&nd);
461     error = PTR_ERR(dentry);
462     if (!IS_ERR(dentry)) {
463 kumaneko 2922 + error = ccs_rmdir_permission(nd.dentry->d_inode, dentry,
464     + nd.mnt);
465 kumaneko 1498 + if (!error)
466     error = vfs_rmdir(nd.dentry->d_inode, dentry);
467     dput(dentry);
468     }
469 kumaneko 2922 @@ -2108,6 +2128,9 @@ static long do_unlinkat(int dfd, const c
470 kumaneko 1498 inode = dentry->d_inode;
471     if (inode)
472     atomic_inc(&inode->i_count);
473 kumaneko 2922 + error = ccs_unlink_permission(nd.dentry->d_inode, dentry,
474     + nd.mnt);
475 kumaneko 2297 + if (!error)
476 kumaneko 1498 error = vfs_unlink(nd.dentry->d_inode, dentry);
477     exit2:
478     dput(dentry);
479 kumaneko 2922 @@ -2186,6 +2209,9 @@ asmlinkage long sys_symlinkat(const char
480 kumaneko 1498 dentry = lookup_create(&nd, 0);
481     error = PTR_ERR(dentry);
482     if (!IS_ERR(dentry)) {
483 kumaneko 2922 + error = ccs_symlink_permission(nd.dentry->d_inode,
484     + dentry, nd.mnt, from);
485 kumaneko 1498 + if (!error)
486     error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
487     dput(dentry);
488     }
489 kumaneko 2922 @@ -2278,6 +2304,9 @@ asmlinkage long sys_linkat(int olddfd, c
490 kumaneko 1498 new_dentry = lookup_create(&nd, 0);
491     error = PTR_ERR(new_dentry);
492     if (!IS_ERR(new_dentry)) {
493 kumaneko 2922 + error = ccs_link_permission(old_nd.dentry, nd.dentry->d_inode,
494     + new_dentry, nd.mnt);
495 kumaneko 1498 + if (!error)
496     error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
497     dput(new_dentry);
498     }
499 kumaneko 2922 @@ -2504,6 +2533,11 @@ static int do_rename(int olddfd, const c
500 kumaneko 1498 if (new_dentry == trap)
501     goto exit5;
502    
503 kumaneko 2922 + error = ccs_rename_permission(old_dir->d_inode, old_dentry,
504     + new_dir->d_inode, new_dentry, newnd.mnt);
505     + if (error)
506     + goto exit5;
507 kumaneko 1498 +
508     error = vfs_rename(old_dir->d_inode, old_dentry,
509     new_dir->d_inode, new_dentry);
510     exit5:
511 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/fs/namespace.c
512     +++ linux-2.6.16-76.51vl4/fs/namespace.c
513 kumaneko 2859 @@ -26,6 +26,7 @@
514 kumaneko 1498 #include <asm/uaccess.h>
515     #include <asm/unistd.h>
516     #include "pnode.h"
517 kumaneko 2859 +#include <linux/ccsecurity.h>
518 kumaneko 1498
519     extern int __init init_rootfs(void);
520    
521 kumaneko 2859 @@ -509,6 +510,9 @@ static int do_umount(struct vfsmount *mn
522 kumaneko 1498 if (retval)
523     return retval;
524    
525     + if (ccs_may_umount(mnt))
526     + return -EPERM;
527     +
528     /*
529     * Allow userspace to request a mountpoint be expired rather than
530     * unmounting unconditionally. Unmount only happens if:
531 kumaneko 2859 @@ -597,6 +601,8 @@ asmlinkage long sys_umount(char __user *
532 kumaneko 1498 {
533     struct nameidata nd;
534     int retval;
535 kumaneko 2282 + if (!ccs_capable(CCS_SYS_UMOUNT))
536 kumaneko 1498 + return -EPERM;
537    
538     retval = __user_walk(name, LOOKUP_FOLLOW, &nd);
539     if (retval)
540 kumaneko 2859 @@ -884,6 +890,9 @@ static int do_loopback(struct nameidata
541 kumaneko 1498
542     if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
543     goto out;
544     + err = -EPERM;
545     + if (ccs_may_mount(nd))
546     + goto out;
547    
548     err = -ENOMEM;
549     if (recurse)
550 kumaneko 2859 @@ -968,7 +977,9 @@ static int do_move_mount(struct nameidat
551 kumaneko 1498 err = -EINVAL;
552     if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
553     goto out;
554     -
555     + err = -EPERM;
556     + if (ccs_may_umount(old_nd.mnt) || ccs_may_mount(nd))
557     + goto out;
558     err = -ENOENT;
559     mutex_lock(&nd->dentry->d_inode->i_mutex);
560     if (IS_DEADDIR(nd->dentry->d_inode))
561 kumaneko 2859 @@ -1070,6 +1081,9 @@ int do_add_mount(struct vfsmount *newmnt
562 kumaneko 1498 err = -EINVAL;
563     if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode))
564     goto unlock;
565     + err = -EPERM;
566     + if (ccs_may_mount(nd))
567     + goto unlock;
568    
569     newmnt->mnt_flags = mnt_flags;
570     if ((err = graft_tree(newmnt, nd)))
571 kumaneko 2922 @@ -1287,6 +1301,10 @@ long do_mount(char *dev_name, char *dir_
572 kumaneko 1498 if (data_page)
573     ((char *)data_page)[PAGE_SIZE - 1] = 0;
574    
575 kumaneko 2922 + retval = ccs_mount_permission(dev_name, dir_name, type_page, &flags);
576 kumaneko 1498 + if (retval)
577     + return retval;
578     +
579     /* Separate the per-mountpoint flags */
580     if (flags & MS_NOSUID)
581     mnt_flags |= MNT_NOSUID;
582 kumaneko 2922 @@ -1585,6 +1603,8 @@ asmlinkage long sys_pivot_root(const cha
583 kumaneko 1498
584     if (!capable(CAP_SYS_ADMIN))
585     return -EPERM;
586 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PIVOT_ROOT))
587 kumaneko 1498 + return -EPERM;
588    
589     lock_kernel();
590    
591 kumaneko 2922 @@ -1601,6 +1621,8 @@ asmlinkage long sys_pivot_root(const cha
592 kumaneko 1498 goto out1;
593    
594     error = security_sb_pivotroot(&old_nd, &new_nd);
595     + if (!error)
596 kumaneko 2922 + error = ccs_pivot_root_permission(&old_nd, &new_nd);
597 kumaneko 1498 if (error) {
598     path_release(&old_nd);
599     goto out1;
600 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/fs/open.c
601     +++ linux-2.6.16-76.51vl4/fs/open.c
602 kumaneko 2859 @@ -30,6 +30,8 @@
603 kumaneko 1498
604     #include <asm/unistd.h>
605    
606 kumaneko 2859 +#include <linux/ccsecurity.h>
607 kumaneko 1498 +
608     int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
609     {
610     int retval = -ENODEV;
611 kumaneko 2859 @@ -269,6 +271,8 @@ static long do_sys_truncate(const char _
612 kumaneko 1498 if (error)
613     goto dput_and_out;
614    
615 kumaneko 2922 + error = ccs_truncate_permission(nd.dentry, nd.mnt, length, 0);
616 kumaneko 1498 + if (!error)
617     error = locks_verify_truncate(inode, NULL, length);
618     if (!error) {
619     DQUOT_INIT(inode);
620 kumaneko 2922 @@ -321,7 +325,9 @@ static long do_sys_ftruncate(unsigned in
621 kumaneko 1498 error = -EPERM;
622     if (IS_APPEND(inode))
623     goto out_putf;
624     -
625 kumaneko 2922 + error = ccs_truncate_permission(dentry, file->f_vfsmnt, length, 0);
626 kumaneko 1498 + if (error)
627     + goto out_putf;
628     error = locks_verify_truncate(inode, file, length);
629     if (!error)
630     error = do_truncate(dentry, length, 0, file);
631 kumaneko 2922 @@ -610,6 +616,10 @@ asmlinkage long sys_chroot(const char __
632 kumaneko 1498 error = -EPERM;
633     if (!capable(CAP_SYS_CHROOT))
634     goto dput_and_out;
635 kumaneko 2282 + if (!ccs_capable(CCS_SYS_CHROOT))
636 kumaneko 1498 + goto dput_and_out;
637 kumaneko 2922 + if (ccs_chroot_permission(&nd))
638 kumaneko 1498 + goto dput_and_out;
639    
640     set_fs_root(current->fs, nd.mnt, nd.dentry);
641     set_fs_altroot();
642 kumaneko 2922 @@ -641,6 +651,9 @@ asmlinkage long sys_fchmod(unsigned int
643 kumaneko 2869 err = -EPERM;
644     if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
645     goto out_putf;
646     + err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode);
647     + if (err)
648     + goto out_putf;
649     mutex_lock(&inode->i_mutex);
650     if (mode == (mode_t) -1)
651     mode = inode->i_mode;
652 kumaneko 2922 @@ -675,6 +688,9 @@ asmlinkage long sys_fchmodat(int dfd, co
653 kumaneko 2869 error = -EPERM;
654     if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
655     goto dput_and_out;
656     + error = ccs_chmod_permission(nd.dentry, nd.mnt, mode);
657     + if (error)
658     + goto dput_and_out;
659    
660     mutex_lock(&inode->i_mutex);
661     if (mode == (mode_t) -1)
662 kumaneko 2922 @@ -737,6 +753,8 @@ asmlinkage long sys_chown(const char __u
663 kumaneko 2869
664     error = user_path_walk(filename, &nd);
665     if (!error) {
666     + error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
667     + if (!error)
668     error = chown_common(nd.dentry, user, group);
669     path_release(&nd);
670     }
671 kumaneko 2922 @@ -756,6 +774,8 @@ asmlinkage long sys_fchownat(int dfd, co
672 kumaneko 2869 follow = (flag & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;
673     error = __user_walk_fd(dfd, filename, follow, &nd);
674     if (!error) {
675     + error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
676     + if (!error)
677     error = chown_common(nd.dentry, user, group);
678     path_release(&nd);
679     }
680 kumaneko 2922 @@ -770,6 +790,8 @@ asmlinkage long sys_lchown(const char __
681 kumaneko 2869
682     error = user_path_walk_link(filename, &nd);
683     if (!error) {
684     + error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
685     + if (!error)
686     error = chown_common(nd.dentry, user, group);
687     path_release(&nd);
688     }
689 kumaneko 2922 @@ -784,6 +806,9 @@ asmlinkage long sys_fchown(unsigned int
690 kumaneko 2869
691     file = fget(fd);
692     if (file) {
693     + error = ccs_chown_permission(file->f_dentry, file->f_vfsmnt,
694     + user, group);
695     + if (!error)
696     error = chown_common(file->f_dentry, user, group);
697     fput(file);
698     }
699 kumaneko 2922 @@ -1192,6 +1217,8 @@ EXPORT_SYMBOL(sys_close);
700 kumaneko 1498 */
701     asmlinkage long sys_vhangup(void)
702     {
703 kumaneko 2282 + if (!ccs_capable(CCS_SYS_VHANGUP))
704 kumaneko 1498 + return -EPERM;
705     if (capable(CAP_SYS_TTY_CONFIG)) {
706     tty_vhangup(current->signal->tty);
707     return 0;
708 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/fs/proc/proc_misc.c
709     +++ linux-2.6.16-76.51vl4/fs/proc/proc_misc.c
710 kumaneko 2796 @@ -682,4 +682,5 @@ void __init proc_misc_init(void)
711 kumaneko 1498 if (entry)
712     entry->proc_fops = &proc_sysrq_trigger_operations;
713     #endif
714 kumaneko 2882 + printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/08/09\n");
715 kumaneko 1498 }
716 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/include/linux/init_task.h
717     +++ linux-2.6.16-76.51vl4/include/linux/init_task.h
718 kumaneko 2796 @@ -121,6 +121,8 @@ extern struct group_info init_groups;
719 kumaneko 1498 .journal_info = NULL, \
720     .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
721     .fs_excl = ATOMIC_INIT(0), \
722 kumaneko 2282 + .ccs_domain_info = NULL, \
723     + .ccs_flags = 0, \
724 kumaneko 1498 }
725    
726    
727 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/include/linux/sched.h
728     +++ linux-2.6.16-76.51vl4/include/linux/sched.h
729 kumaneko 2796 @@ -40,6 +40,8 @@
730 kumaneko 1498
731     struct exec_domain;
732    
733 kumaneko 2282 +struct ccs_domain_info;
734 kumaneko 1498 +
735     /*
736     * cloning flags:
737     */
738 kumaneko 2796 @@ -873,6 +875,8 @@ struct task_struct {
739 kumaneko 1498 struct rcu_head rcu;
740 kumaneko 2405
741     struct list_head *scm_work_list;
742 kumaneko 2282 + struct ccs_domain_info *ccs_domain_info;
743     + u32 ccs_flags;
744 kumaneko 1498 };
745    
746     static inline pid_t process_group(struct task_struct *tsk)
747 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/compat.c
748     +++ linux-2.6.16-76.51vl4/kernel/compat.c
749 kumaneko 2796 @@ -23,6 +23,7 @@
750 kumaneko 1498 #include <linux/security.h>
751    
752     #include <asm/uaccess.h>
753 kumaneko 2859 +#include <linux/ccsecurity.h>
754 kumaneko 1498
755     int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
756     {
757 kumaneko 2796 @@ -864,6 +865,8 @@ asmlinkage long compat_sys_stime(compat_
758 kumaneko 1498 err = security_settime(&tv, NULL);
759     if (err)
760     return err;
761 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
762 kumaneko 1498 + return -EPERM;
763    
764     do_settimeofday(&tv);
765     return 0;
766 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/kexec.c
767     +++ linux-2.6.16-76.51vl4/kernel/kexec.c
768 kumaneko 2796 @@ -26,6 +26,7 @@
769 kumaneko 1498 #include <asm/io.h>
770     #include <asm/system.h>
771     #include <asm/semaphore.h>
772 kumaneko 2859 +#include <linux/ccsecurity.h>
773 kumaneko 1498
774     /* Per cpu memory for storing cpu states in case of system crash. */
775     note_buf_t* crash_notes;
776 kumaneko 2796 @@ -922,6 +923,8 @@ asmlinkage long sys_kexec_load(unsigned
777 kumaneko 1498 /* We only trust the superuser with rebooting the system. */
778     if (!capable(CAP_SYS_BOOT))
779     return -EPERM;
780 kumaneko 2282 + if (!ccs_capable(CCS_SYS_KEXEC_LOAD))
781 kumaneko 1498 + return -EPERM;
782    
783     /*
784     * Verify we have a legal set of flags
785 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/kmod.c
786     +++ linux-2.6.16-76.51vl4/kernel/kmod.c
787 kumaneko 2796 @@ -150,6 +150,9 @@ static int ____call_usermodehelper(void
788 kumaneko 1498 /* We can run anywhere, unlike our parent keventd(). */
789     set_cpus_allowed(current, CPU_MASK_ALL);
790    
791 kumaneko 2282 + current->ccs_domain_info = NULL;
792     + current->ccs_flags = 0;
793 kumaneko 1498 +
794     retval = -EPERM;
795     if (current->fs->root)
796     retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
797 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/module.c
798     +++ linux-2.6.16-76.51vl4/kernel/module.c
799 kumaneko 2796 @@ -42,6 +42,7 @@
800 kumaneko 1498 #include <asm/uaccess.h>
801     #include <asm/semaphore.h>
802     #include <asm/cacheflush.h>
803 kumaneko 2859 +#include <linux/ccsecurity.h>
804 kumaneko 1498
805     #if 0
806     #define DEBUGP printk
807 kumaneko 2796 @@ -578,7 +579,8 @@ sys_delete_module(const char __user *nam
808 kumaneko 1498
809     if (!capable(CAP_SYS_MODULE))
810     return -EPERM;
811     -
812 kumaneko 2282 + if (!ccs_capable(CCS_USE_KERNEL_MODULE))
813 kumaneko 1498 + return -EPERM;
814     if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
815     return -EFAULT;
816     name[MODULE_NAME_LEN-1] = '\0';
817 kumaneko 2796 @@ -1931,7 +1933,8 @@ sys_init_module(void __user *umod,
818 kumaneko 1498 /* Must have permission */
819     if (!capable(CAP_SYS_MODULE))
820     return -EPERM;
821     -
822 kumaneko 2282 + if (!ccs_capable(CCS_USE_KERNEL_MODULE))
823 kumaneko 1498 + return -EPERM;
824     /* Only one module load at a time, please */
825     if (down_interruptible(&module_mutex) != 0)
826     return -EINTR;
827 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/ptrace.c
828     +++ linux-2.6.16-76.51vl4/kernel/ptrace.c
829 kumaneko 2796 @@ -21,6 +21,7 @@
830 kumaneko 1498
831     #include <asm/pgtable.h>
832     #include <asm/uaccess.h>
833 kumaneko 2859 +#include <linux/ccsecurity.h>
834 kumaneko 1498
835     /*
836     * ptrace a task: make the debugger its new parent and
837 kumaneko 2796 @@ -495,6 +496,8 @@ asmlinkage long sys_ptrace(long request,
838 kumaneko 1498 /*
839     * This lock_kernel fixes a subtle race with suid exec
840     */
841 kumaneko 2282 + if (!ccs_capable(CCS_SYS_PTRACE))
842 kumaneko 1498 + return -EPERM;
843     lock_kernel();
844     if (request == PTRACE_TRACEME) {
845     ret = ptrace_traceme();
846 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/sched.c
847     +++ linux-2.6.16-76.51vl4/kernel/sched.c
848 kumaneko 2796 @@ -52,6 +52,7 @@
849 kumaneko 1498 #include <asm/tlb.h>
850    
851     #include <asm/unistd.h>
852 kumaneko 2859 +#include <linux/ccsecurity.h>
853 kumaneko 1498
854     /*
855     * Convert user-nice values [ -20 ... 0 ... 19 ]
856 kumaneko 2796 @@ -3545,6 +3546,8 @@ asmlinkage long sys_nice(int increment)
857 kumaneko 1498 {
858     int retval;
859     long nice;
860 kumaneko 2282 + if (!ccs_capable(CCS_SYS_NICE))
861 kumaneko 1498 + return -EPERM;
862    
863     /*
864     * Setpriority might change our priority at the same moment.
865 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/signal.c
866     +++ linux-2.6.16-76.51vl4/kernel/signal.c
867 kumaneko 2796 @@ -30,6 +30,7 @@
868 kumaneko 1498 #include <asm/uaccess.h>
869     #include <asm/unistd.h>
870     #include <asm/siginfo.h>
871 kumaneko 2859 +#include <linux/ccsecurity.h>
872 kumaneko 1498
873     /*
874     * SLAB caches for signal bits.
875 kumaneko 2851 @@ -2336,6 +2337,8 @@ asmlinkage long
876 kumaneko 1498 sys_kill(int pid, int sig)
877     {
878     struct siginfo info;
879 kumaneko 2851 + if (ccs_kill_permission(pid, sig))
880 kumaneko 1498 + return -EPERM;
881    
882     info.si_signo = sig;
883     info.si_errno = 0;
884 kumaneko 2851 @@ -2394,6 +2397,8 @@ asmlinkage long sys_tgkill(int tgid, int
885 kumaneko 1498 /* This is only valid for single tasks */
886     if (pid <= 0 || tgid <= 0)
887     return -EINVAL;
888 kumaneko 2851 + if (ccs_tgkill_permission(tgid, pid, sig))
889 kumaneko 1498 + return -EPERM;
890    
891     return do_tkill(tgid, pid, sig);
892     }
893 kumaneko 2851 @@ -2407,6 +2412,8 @@ sys_tkill(int pid, int sig)
894 kumaneko 1498 /* This is only valid for single tasks */
895     if (pid <= 0)
896     return -EINVAL;
897 kumaneko 2851 + if (ccs_tkill_permission(pid, sig))
898 kumaneko 1498 + return -EPERM;
899    
900     return do_tkill(0, pid, sig);
901     }
902 kumaneko 2869 @@ -2424,6 +2431,8 @@ sys_rt_sigqueueinfo(int pid, int sig, si
903     if (info.si_code >= 0)
904     return -EPERM;
905     info.si_signo = sig;
906     + if (ccs_sigqueue_permission(pid, sig))
907     + return -EPERM;
908    
909     /* POSIX.1b doesn't mention process groups. */
910     return kill_proc_info(sig, &info, pid);
911 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/sys.c
912     +++ linux-2.6.16-76.51vl4/kernel/sys.c
913 kumaneko 2796 @@ -38,6 +38,7 @@
914 kumaneko 1498 #include <asm/uaccess.h>
915     #include <asm/io.h>
916     #include <asm/unistd.h>
917 kumaneko 2859 +#include <linux/ccsecurity.h>
918 kumaneko 1498
919     #ifndef SET_UNALIGN_CTL
920     # define SET_UNALIGN_CTL(a,b) (-EINVAL)
921 kumaneko 2796 @@ -269,6 +270,10 @@ asmlinkage long sys_setpriority(int whic
922 kumaneko 1498
923     if (which > 2 || which < 0)
924     goto out;
925 kumaneko 2282 + if (!ccs_capable(CCS_SYS_NICE)) {
926 kumaneko 1498 + error = -EPERM;
927     + goto out;
928     + }
929    
930     /* normalize: avoid signed division (rounding problems) */
931     error = -ESRCH;
932 kumaneko 2796 @@ -496,6 +501,8 @@ asmlinkage long sys_reboot(int magic1, i
933 kumaneko 1498 magic2 != LINUX_REBOOT_MAGIC2B &&
934     magic2 != LINUX_REBOOT_MAGIC2C))
935     return -EINVAL;
936 kumaneko 2282 + if (!ccs_capable(CCS_SYS_REBOOT))
937 kumaneko 1498 + return -EPERM;
938    
939     /* Instead of trying to make the power_off code look like
940     * halt when pm_power_off is not set do it the easy way.
941 kumaneko 2796 @@ -1533,6 +1540,8 @@ asmlinkage long sys_sethostname(char __u
942 kumaneko 1498 return -EPERM;
943     if (len < 0 || len > __NEW_UTS_LEN)
944     return -EINVAL;
945 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETHOSTNAME))
946 kumaneko 1498 + return -EPERM;
947     down_write(&uts_sem);
948     errno = -EFAULT;
949     if (!copy_from_user(tmp, name, len)) {
950 kumaneko 2796 @@ -1578,6 +1587,8 @@ asmlinkage long sys_setdomainname(char _
951 kumaneko 1498 return -EPERM;
952     if (len < 0 || len > __NEW_UTS_LEN)
953     return -EINVAL;
954 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETHOSTNAME))
955 kumaneko 1498 + return -EPERM;
956    
957     down_write(&uts_sem);
958     errno = -EFAULT;
959 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/sysctl.c
960     +++ linux-2.6.16-76.51vl4/kernel/sysctl.c
961 kumaneko 2796 @@ -49,6 +49,7 @@
962 kumaneko 1498
963     #include <asm/uaccess.h>
964     #include <asm/processor.h>
965 kumaneko 2859 +#include <linux/ccsecurity.h>
966 kumaneko 1498
967     extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
968     void __user *buffer, size_t *lenp, loff_t *ppos);
969 kumaneko 2796 @@ -1133,6 +1134,9 @@ int do_sysctl(int __user *name, int nlen
970 kumaneko 1498
971     spin_unlock(&sysctl_lock);
972    
973 kumaneko 2298 + error = ccs_parse_table(name, nlen, oldval, newval,
974 kumaneko 1498 + head->ctl_table);
975     + if (!error)
976     error = parse_table(name, nlen, oldval, oldlenp,
977     newval, newlen, head->ctl_table,
978     &context);
979 kumaneko 2796 @@ -1205,6 +1209,13 @@ repeat:
980 kumaneko 1498 if (ctl_perm(table, 001))
981     return -EPERM;
982     if (table->strategy) {
983     + int op = 0;
984     + if (oldval)
985     + op |= 004;
986     + if (newval)
987     + op |= 002;
988     + if (ctl_perm(table, op))
989     + return -EPERM;
990     error = table->strategy(
991     table, name, nlen,
992     oldval, oldlenp,
993 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/kernel/time.c
994     +++ linux-2.6.16-76.51vl4/kernel/time.c
995 kumaneko 2796 @@ -39,6 +39,7 @@
996 kumaneko 1498
997     #include <asm/uaccess.h>
998     #include <asm/unistd.h>
999 kumaneko 2859 +#include <linux/ccsecurity.h>
1000 kumaneko 1498
1001     /*
1002     * The timezone where the local system is located. Used as a default by some
1003 kumaneko 2796 @@ -91,6 +92,8 @@ asmlinkage long sys_stime(time_t __user
1004 kumaneko 1498 err = security_settime(&tv, NULL);
1005     if (err)
1006     return err;
1007 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
1008 kumaneko 1498 + return -EPERM;
1009    
1010     do_settimeofday(&tv);
1011     return 0;
1012 kumaneko 2796 @@ -161,6 +164,8 @@ int do_sys_settimeofday(struct timespec
1013 kumaneko 1498 error = security_settime(tv, tz);
1014     if (error)
1015     return error;
1016 kumaneko 2282 + if (!ccs_capable(CCS_SYS_SETTIME))
1017 kumaneko 1498 + return -EPERM;
1018    
1019     if (tz) {
1020     /* SMP safe, global irq locking makes it work. */
1021 kumaneko 2796 @@ -239,6 +244,8 @@ int do_adjtimex(struct timex *txc)
1022 kumaneko 1498 /* In order to modify anything, you gotta be super-user! */
1023     if (txc->modes && !capable(CAP_SYS_TIME))
1024     return -EPERM;
1025 kumaneko 2282 + if (txc->modes && !ccs_capable(CCS_SYS_SETTIME))
1026 kumaneko 1498 + return -EPERM;
1027    
1028     /* Now we validate the data before disabling interrupts */
1029    
1030 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv4/inet_connection_sock.c
1031     +++ linux-2.6.16-76.51vl4/net/ipv4/inet_connection_sock.c
1032 kumaneko 2796 @@ -24,6 +24,7 @@
1033 kumaneko 1498 #include <net/route.h>
1034     #include <net/tcp_states.h>
1035     #include <net/xfrm.h>
1036 kumaneko 2859 +#include <linux/ccsecurity.h>
1037 kumaneko 1498
1038     #ifdef INET_CSK_DEBUG
1039     const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
1040 kumaneko 2796 @@ -88,6 +89,8 @@ int inet_csk_get_port(struct inet_hashin
1041 kumaneko 1498 do {
1042     head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)];
1043     spin_lock(&head->lock);
1044 kumaneko 2299 + if (ccs_lport_reserved(rover))
1045 kumaneko 1498 + goto next;
1046     inet_bind_bucket_for_each(tb, node, &head->chain)
1047     if (tb->port == rover)
1048     goto next;
1049 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv4/inet_hashtables.c
1050     +++ linux-2.6.16-76.51vl4/net/ipv4/inet_hashtables.c
1051 kumaneko 2796 @@ -23,6 +23,7 @@
1052 kumaneko 1498 #include <net/inet_connection_sock.h>
1053     #include <net/inet_hashtables.h>
1054     #include <net/ip.h>
1055 kumaneko 2859 +#include <linux/ccsecurity.h>
1056 kumaneko 1498
1057     /*
1058     * Allocate and initialize a new local port bind bucket.
1059 kumaneko 2796 @@ -268,6 +269,8 @@ int inet_hash_connect(struct inet_timewa
1060 kumaneko 1498 local_bh_disable();
1061     for (i = 1; i <= range; i++) {
1062     port = low + (i + offset) % range;
1063 kumaneko 2299 + if (ccs_lport_reserved(port))
1064 kumaneko 1498 + continue;
1065     head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1066     spin_lock(&head->lock);
1067    
1068 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv4/raw.c
1069     +++ linux-2.6.16-76.51vl4/net/ipv4/raw.c
1070 kumaneko 2796 @@ -79,6 +79,7 @@
1071 kumaneko 2459 #include <linux/seq_file.h>
1072     #include <linux/netfilter.h>
1073     #include <linux/netfilter_ipv4.h>
1074 kumaneko 2859 +#include <linux/ccsecurity.h>
1075 kumaneko 2459
1076     struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
1077     DEFINE_RWLOCK(raw_v4_lock);
1078 kumaneko 2796 @@ -592,6 +593,9 @@ static int raw_recvmsg(struct kiocb *ioc
1079 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1080     if (!skb)
1081     goto out;
1082     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1083     + if (err)
1084     + goto out;
1085    
1086     copied = skb->len;
1087     if (len < copied) {
1088 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv4/udp.c
1089     +++ linux-2.6.16-76.51vl4/net/ipv4/udp.c
1090 kumaneko 2859 @@ -109,6 +109,7 @@
1091 kumaneko 1498 #include <net/inet_common.h>
1092     #include <net/checksum.h>
1093     #include <net/xfrm.h>
1094 kumaneko 2859 +#include <linux/ccsecurity.h>
1095 kumaneko 1498
1096     /*
1097     * Snmp MIB for the UDP layer
1098 kumaneko 2859 @@ -147,6 +148,8 @@ static int udp_v4_get_port(struct sock *
1099 kumaneko 1498 result = sysctl_local_port_range[0] +
1100     ((result - sysctl_local_port_range[0]) &
1101     (UDP_HTABLE_SIZE - 1));
1102 kumaneko 2299 + if (ccs_lport_reserved(result))
1103 kumaneko 1498 + continue;
1104     goto gotit;
1105     }
1106     size = 0;
1107 kumaneko 2859 @@ -163,6 +166,8 @@ static int udp_v4_get_port(struct sock *
1108 kumaneko 1498 result = sysctl_local_port_range[0]
1109     + ((result - sysctl_local_port_range[0]) &
1110     (UDP_HTABLE_SIZE - 1));
1111 kumaneko 2299 + if (ccs_lport_reserved(result))
1112 kumaneko 1498 + continue;
1113     if (!udp_lport_inuse(result))
1114     break;
1115     }
1116 kumaneko 2859 @@ -797,7 +802,10 @@ try_again:
1117 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1118     if (!skb)
1119     goto out;
1120     -
1121     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1122     + if (err)
1123     + goto out;
1124     +
1125     copied = skb->len - sizeof(struct udphdr);
1126     if (copied > len) {
1127     copied = len;
1128 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv6/inet6_hashtables.c
1129     +++ linux-2.6.16-76.51vl4/net/ipv6/inet6_hashtables.c
1130 kumaneko 2796 @@ -22,6 +22,7 @@
1131 kumaneko 1498 #include <net/inet_hashtables.h>
1132     #include <net/inet6_hashtables.h>
1133     #include <net/ip.h>
1134 kumaneko 2859 +#include <linux/ccsecurity.h>
1135 kumaneko 1498
1136     struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
1137     const struct in6_addr *daddr,
1138 kumaneko 2796 @@ -93,7 +94,7 @@ static int __inet6_check_established(str
1139 kumaneko 1498 const struct in6_addr *saddr = &np->daddr;
1140     const int dif = sk->sk_bound_dev_if;
1141     const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
1142     - const unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr,
1143     + const unsigned int hash = inet6_ehashfn(daddr, lport, saddr,
1144     inet->dport);
1145     struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
1146     struct sock *sk2;
1147 kumaneko 2796 @@ -187,6 +188,8 @@ int inet6_hash_connect(struct inet_timew
1148 kumaneko 1498 local_bh_disable();
1149     for (i = 1; i <= range; i++) {
1150     port = low + (i + offset) % range;
1151 kumaneko 2299 + if (ccs_lport_reserved(port))
1152 kumaneko 1498 + continue;
1153     head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1154     spin_lock(&head->lock);
1155    
1156 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv6/raw.c
1157     +++ linux-2.6.16-76.51vl4/net/ipv6/raw.c
1158 kumaneko 2796 @@ -56,6 +56,7 @@
1159 kumaneko 2459
1160     #include <linux/proc_fs.h>
1161     #include <linux/seq_file.h>
1162 kumaneko 2859 +#include <linux/ccsecurity.h>
1163 kumaneko 2459
1164     struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
1165     DEFINE_RWLOCK(raw_v6_lock);
1166 kumaneko 2796 @@ -387,6 +388,9 @@ static int rawv6_recvmsg(struct kiocb *i
1167 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1168     if (!skb)
1169     goto out;
1170     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1171     + if (err)
1172     + goto out;
1173    
1174     copied = skb->len;
1175     if (copied > len) {
1176 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/ipv6/udp.c
1177     +++ linux-2.6.16-76.51vl4/net/ipv6/udp.c
1178 kumaneko 2859 @@ -59,6 +59,7 @@
1179 kumaneko 1498
1180     #include <linux/proc_fs.h>
1181     #include <linux/seq_file.h>
1182 kumaneko 2859 +#include <linux/ccsecurity.h>
1183 kumaneko 1498
1184     DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
1185    
1186 kumaneko 2859 @@ -89,6 +90,8 @@ static int udp_v6_get_port(struct sock *
1187 kumaneko 1498 result = sysctl_local_port_range[0] +
1188     ((result - sysctl_local_port_range[0]) &
1189     (UDP_HTABLE_SIZE - 1));
1190 kumaneko 2299 + if (ccs_lport_reserved(result))
1191 kumaneko 1498 + continue;
1192     goto gotit;
1193     }
1194     size = 0;
1195 kumaneko 2859 @@ -105,6 +108,8 @@ static int udp_v6_get_port(struct sock *
1196 kumaneko 1498 result = sysctl_local_port_range[0]
1197     + ((result - sysctl_local_port_range[0]) &
1198     (UDP_HTABLE_SIZE - 1));
1199 kumaneko 2299 + if (ccs_lport_reserved(result))
1200 kumaneko 1498 + continue;
1201     if (!udp_lport_inuse(result))
1202     break;
1203     }
1204 kumaneko 2859 @@ -238,6 +243,9 @@ try_again:
1205 kumaneko 2459 skb = skb_recv_datagram(sk, flags, noblock, &err);
1206     if (!skb)
1207     goto out;
1208     + err = ccs_socket_recvmsg_permission(sk, skb, flags);
1209     + if (err)
1210     + goto out;
1211    
1212     copied = skb->len - sizeof(struct udphdr);
1213     if (copied > len) {
1214 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/socket.c
1215     +++ linux-2.6.16-76.51vl4/net/socket.c
1216 kumaneko 2859 @@ -97,6 +97,8 @@
1217 kumaneko 1498 #include <net/sock.h>
1218     #include <linux/netfilter.h>
1219    
1220 kumaneko 2859 +#include <linux/ccsecurity.h>
1221 kumaneko 1498 +
1222     static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
1223     static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
1224     size_t size, loff_t pos);
1225 kumaneko 2859 @@ -544,9 +546,12 @@ static inline int __sock_sendmsg(struct
1226 kumaneko 2805 si->size = size;
1227    
1228 kumaneko 1498 err = security_socket_sendmsg(sock, msg, size);
1229 kumaneko 2805 + if (!err)
1230     + err = ccs_socket_sendmsg_permission(sock, (struct sockaddr *)
1231     + msg->msg_name,
1232     + msg->msg_namelen);
1233 kumaneko 1498 if (err)
1234     return err;
1235     -
1236     return sock->ops->sendmsg(iocb, sock, msg, size);
1237     }
1238    
1239 kumaneko 2859 @@ -1103,6 +1108,8 @@ static int __sock_create(int family, int
1240 kumaneko 1498 }
1241    
1242     err = security_socket_create(family, type, protocol, kern);
1243 kumaneko 2805 + if (!err)
1244     + err = ccs_socket_create_permission(family, type, protocol);
1245 kumaneko 1498 if (err)
1246     return err;
1247 kumaneko 2805
1248 kumaneko 2859 @@ -1299,6 +1306,10 @@ asmlinkage long sys_bind(int fd, struct
1249 kumaneko 1498 sockfd_put(sock);
1250     return err;
1251     }
1252     + err = ccs_socket_bind_permission(sock,
1253     + (struct sockaddr *)
1254     + address, addrlen);
1255     + if (!err)
1256     err = sock->ops->bind(sock, (struct sockaddr *)address, addrlen);
1257     }
1258     sockfd_put(sock);
1259 kumaneko 2859 @@ -1329,7 +1340,8 @@ asmlinkage long sys_listen(int fd, int b
1260 kumaneko 1498 sockfd_put(sock);
1261     return err;
1262     }
1263     -
1264     + err = ccs_socket_listen_permission(sock);
1265     + if (!err)
1266     err=sock->ops->listen(sock, backlog);
1267     sockfd_put(sock);
1268     }
1269 kumaneko 2859 @@ -1380,6 +1392,11 @@ asmlinkage long sys_accept(int fd, struc
1270 kumaneko 1498 if (err < 0)
1271     goto out_release;
1272    
1273     + if (ccs_socket_accept_permission(newsock,
1274     + (struct sockaddr *) address)) {
1275     + err = -ECONNABORTED; /* Hope less harmful than -EPERM. */
1276     + goto out_release;
1277     + }
1278     if (upeer_sockaddr) {
1279     if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) {
1280     err = -ECONNABORTED;
1281 kumaneko 2859 @@ -1433,9 +1450,11 @@ asmlinkage long sys_connect(int fd, stru
1282 kumaneko 2805 goto out_put;
1283    
1284 kumaneko 1498 err = security_socket_connect(sock, (struct sockaddr *)address, addrlen);
1285 kumaneko 2805 + if (!err)
1286     + err = ccs_socket_connect_permission(sock, (struct sockaddr *)
1287     + address, addrlen);
1288 kumaneko 1498 if (err)
1289     goto out_put;
1290     -
1291     err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1292     sock->file->f_flags);
1293     out_put:
1294 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/net/unix/af_unix.c
1295     +++ linux-2.6.16-76.51vl4/net/unix/af_unix.c
1296 kumaneko 2796 @@ -117,6 +117,7 @@
1297 kumaneko 1498 #include <linux/mount.h>
1298     #include <net/checksum.h>
1299     #include <linux/security.h>
1300 kumaneko 2859 +#include <linux/ccsecurity.h>
1301 kumaneko 1498
1302     int sysctl_unix_max_dgram_qlen = 10;
1303    
1304 kumaneko 2796 @@ -782,6 +783,9 @@ static int unix_bind(struct socket *sock
1305 kumaneko 1498 */
1306     mode = S_IFSOCK |
1307     (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
1308 kumaneko 2922 + err = ccs_mknod_permission(nd.dentry->d_inode, dentry, nd.mnt,
1309     + mode, 0);
1310 kumaneko 1498 + if (!err)
1311     err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
1312     if (err)
1313     goto out_mknod_dput;
1314 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/security/Kconfig
1315     +++ linux-2.6.16-76.51vl4/security/Kconfig
1316 kumaneko 2858 @@ -101,5 +101,7 @@ config SECURITY_SECLVL
1317    
1318     source security/selinux/Kconfig
1319    
1320     +source security/ccsecurity/Kconfig
1321     +
1322     endmenu
1323    
1324 kumaneko 2882 --- linux-2.6.16-76.51vl4.orig/security/Makefile
1325     +++ linux-2.6.16-76.51vl4/security/Makefile
1326 kumaneko 2858 @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin
1327     obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
1328     obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o
1329     obj-$(CONFIG_SECURITY_SECLVL) += seclvl.o
1330     +
1331     +subdir-$(CONFIG_CCSECURITY)+= ccsecurity
1332     +obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o

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