ccs-patch/patches/ccs-patch-2.6.18-debian-etch.diff

This is TOMOYO Linux patch for Debian Etch.

Source code for this patch is "apt-get install linux-source-2.6.18"
---
 arch/alpha/kernel/ptrace.c      |    7 ++++
 arch/ia64/ia32/sys_ia32.c       |    7 ++++
 arch/ia64/kernel/ptrace.c       |    7 ++++
 arch/m32r/kernel/ptrace.c       |    7 ++++
 arch/mips/kernel/ptrace32.c     |    7 ++++
 arch/powerpc/kernel/ptrace32.c  |    7 ++++
 arch/s390/kernel/ptrace.c       |    7 ++++
 arch/sparc/kernel/ptrace.c      |    9 ++++++
 arch/sparc64/kernel/ptrace.c    |    9 ++++++
 arch/x86_64/ia32/ptrace32.c     |    7 ++++
 fs/Kconfig                      |    2 +
 fs/Makefile                     |    2 +
 fs/attr.c                       |   19 ++++++++++++
 fs/compat.c                     |   15 +++++++++-
 fs/exec.c                       |   18 +++++++++++-
 fs/fcntl.c                      |    9 ++++++
 fs/ioctl.c                      |   11 +++++++
 fs/namei.c                      |   60 ++++++++++++++++++++++++++++++++++++++++
 fs/namespace.c                  |   50 ++++++++++++++++++++++++++++++++-
 fs/open.c                       |   28 ++++++++++++++++++
 fs/proc/Makefile                |    3 ++
 fs/proc/proc_misc.c             |    5 +++
 include/linux/init_task.h       |    4 ++
 include/linux/sched.h           |    8 +++++
 kernel/compat.c                 |    7 ++++
 kernel/kexec.c                  |    7 ++++
 kernel/kmod.c                   |    5 +++
 kernel/module.c                 |   13 +++++++-
 kernel/ptrace.c                 |    7 ++++
 kernel/sched.c                  |    7 ++++
 kernel/signal.c                 |   21 ++++++++++++++
 kernel/sys.c                    |   21 ++++++++++++++
 kernel/sysctl.c                 |   17 +++++++++++
 kernel/time.c                   |   15 ++++++++++
 net/ipv4/inet_connection_sock.c |    7 ++++
 net/ipv4/inet_hashtables.c      |    7 ++++
 net/ipv4/raw.c                  |    8 +++++
 net/ipv4/udp.c                  |   21 +++++++++++++-
 net/ipv6/inet6_hashtables.c     |    9 +++++-
 net/ipv6/raw.c                  |    8 +++++
 net/ipv6/udp.c                  |   19 ++++++++++++
 net/socket.c                    |   43 +++++++++++++++++++++++++++-
 net/unix/af_unix.c              |    8 +++++
 43 files changed, 549 insertions(+), 9 deletions(-)

--- linux-2.6.18-24.orig/arch/alpha/kernel/ptrace.c
+++ linux-2.6.18-24/arch/alpha/kernel/ptrace.c
@@ -20,6 +20,9 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/fpu.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "proto.h"
 
@@ -268,6 +271,10 @@ do_sys_ptrace(long request, long pid, lo
        unsigned long tmp;
        size_t copied;
        long ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",
--- linux-2.6.18-24.orig/arch/ia64/ia32/sys_ia32.c
+++ linux-2.6.18-24/arch/ia64/ia32/sys_ia32.c
@@ -56,6 +56,9 @@
 #include <asm/types.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "ia32priv.h"
 
@@ -1741,6 +1744,10 @@ sys32_ptrace (int request, pid_t pid, un
        struct task_struct *child;
        unsigned int value, tmp;
        long i, ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        if (request == PTRACE_TRACEME) {
--- linux-2.6.18-24.orig/arch/ia64/kernel/ptrace.c
+++ linux-2.6.18-24/arch/ia64/kernel/ptrace.c
@@ -28,6 +28,9 @@
 #ifdef CONFIG_PERFMON
 #include <asm/perfmon.h>
 #endif
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "entry.h"
 
@@ -1417,6 +1420,10 @@ sys_ptrace (long request, pid_t pid, uns
        struct task_struct *child;
        struct switch_stack *sw;
        long ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        ret = -EPERM;
--- linux-2.6.18-24.orig/arch/m32r/kernel/ptrace.c
+++ linux-2.6.18-24/arch/m32r/kernel/ptrace.c
@@ -32,6 +32,9 @@
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/mmu_context.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * This routine will get a word off of the process kernel stack.
@@ -742,6 +745,10 @@ asmlinkage long sys_ptrace(long request,
 {
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        if (request == PTRACE_TRACEME) {
--- linux-2.6.18-24.orig/arch/mips/kernel/ptrace32.c
+++ linux-2.6.18-24/arch/mips/kernel/ptrace32.c
@@ -35,6 +35,9 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/bootinfo.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 int ptrace_getregs (struct task_struct *child, __s64 __user *data);
 int ptrace_setregs (struct task_struct *child, __s64 __user *data);
@@ -50,6 +53,10 @@ asmlinkage int sys32_ptrace(int request,
 {
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
 #if 0
        printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
--- linux-2.6.18-24.orig/arch/powerpc/kernel/ptrace32.c
+++ linux-2.6.18-24/arch/powerpc/kernel/ptrace32.c
@@ -32,6 +32,9 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "ptrace-common.h"
 
@@ -45,6 +48,10 @@ long compat_sys_ptrace(int request, int 
 {
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        if (request == PTRACE_TRACEME) {
--- linux-2.6.18-24.orig/arch/s390/kernel/ptrace.c
+++ linux-2.6.18-24/arch/s390/kernel/ptrace.c
@@ -41,6 +41,9 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #ifdef CONFIG_COMPAT
 #include "compat_ptrace.h"
@@ -711,6 +714,10 @@ sys_ptrace(long request, long pid, long 
        struct task_struct *child;
        int ret;
 
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                 ret = ptrace_traceme();
--- linux-2.6.18-24.orig/arch/sparc/kernel/ptrace.c
+++ linux-2.6.18-24/arch/sparc/kernel/ptrace.c
@@ -23,6 +23,9 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #define MAGIC_CONSTANT 0x80000000
 
@@ -267,6 +270,12 @@ asmlinkage void do_ptrace(struct pt_regs
        unsigned long addr2 = regs->u_regs[UREG_I4];
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE)) {
+               pt_error_return(regs, EPERM);
+               return;
+       }
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
 #ifdef DEBUG_PTRACE
--- linux-2.6.18-24.orig/arch/sparc64/kernel/ptrace.c
+++ linux-2.6.18-24/arch/sparc64/kernel/ptrace.c
@@ -32,6 +32,9 @@
 #include <asm/spitfire.h>
 #include <asm/page.h>
 #include <asm/cpudata.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /* Returning from ptrace is a bit tricky because the syscall return
  * low level code assumes any value returned which is negative and
@@ -176,6 +179,12 @@ asmlinkage void do_ptrace(struct pt_regs
        unsigned long addr2 = regs->u_regs[UREG_I4];
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE)) {
+               pt_error_return(regs, EPERM);
+               return;
+       }
+       /***** TOMOYO Linux end. *****/
 
        if (test_thread_flag(TIF_32BIT)) {
                addr &= 0xffffffffUL;
--- linux-2.6.18-24.orig/arch/x86_64/ia32/ptrace32.c
+++ linux-2.6.18-24/arch/x86_64/ia32/ptrace32.c
@@ -26,6 +26,9 @@
 #include <asm/i387.h>
 #include <asm/fpu32.h>
 #include <asm/ia32.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * Determines which flags the user has access to [1 = access, 0 = no access].
@@ -230,6 +233,10 @@ asmlinkage long sys32_ptrace(long reques
        void __user *datap = compat_ptr(data);
        int ret;
        __u32 val;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        switch (request) { 
        case PTRACE_TRACEME:
--- linux-2.6.18-24.orig/fs/Kconfig
+++ linux-2.6.18-24/fs/Kconfig
@@ -1931,5 +1931,7 @@ endmenu
 
 source "fs/nls/Kconfig"
 
+source "fs/Kconfig.ccs"
+
 endmenu
 
--- linux-2.6.18-24.orig/fs/Makefile
+++ linux-2.6.18-24/fs/Makefile
@@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
+
+include $(srctree)/fs/Makefile-2.6.ccs
--- linux-2.6.18-24.orig/fs/attr.c
+++ linux-2.6.18-24/fs/attr.c
@@ -15,6 +15,9 @@
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /* Taken over from the old code... */
 
@@ -145,12 +148,28 @@ int notify_change(struct dentry * dentry
 
        if (inode->i_op && inode->i_op->setattr) {
                error = security_inode_setattr(dentry, attr);
+               /***** TOMOYO Linux start. *****/
+               if (!error && (ia_valid & ATTR_MODE) &&
+                   !ccs_capable(CCS_SYS_CHMOD))
+                       error = -EPERM;
+               if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) &&
+                   !ccs_capable(CCS_SYS_CHOWN))
+                       error = -EPERM;
+               /***** TOMOYO Linux end. *****/
                if (!error)
                        error = inode->i_op->setattr(dentry, attr);
        } else {
                error = inode_change_ok(inode, attr);
                if (!error)
                        error = security_inode_setattr(dentry, attr);
+               /***** TOMOYO Linux start. *****/
+               if (!error && (ia_valid & ATTR_MODE) &&
+                   !ccs_capable(CCS_SYS_CHMOD))
+                       error = -EPERM;
+               if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) &&
+                   !ccs_capable(CCS_SYS_CHOWN))
+                       error = -EPERM;
+               /***** TOMOYO Linux end. *****/
                if (!error) {
                        if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
                            (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
--- linux-2.6.18-24.orig/fs/compat.c
+++ linux-2.6.18-24/fs/compat.c
@@ -52,6 +52,9 @@
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/ioctls.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
 
@@ -397,6 +400,10 @@ asmlinkage long compat_sys_ioctl(unsigne
 
        /* RED-PEN how should LSM module know it's handling 32bit? */
        error = security_file_ioctl(filp, cmd, arg);
+       /***** TOMOYO Linux start. *****/
+       if (!error)
+               error = ccs_check_ioctl_permission(filp, cmd, arg);
+       /***** TOMOYO Linux end. *****/
        if (error)
                goto out_fput;
 
@@ -421,6 +428,12 @@ asmlinkage long compat_sys_ioctl(unsigne
                /*FALL THROUGH*/
 
        default:
+               /***** TOMOYO Linux start. *****/
+               if (!ccs_capable(CCS_SYS_IOCTL)) {
+                       error = -EPERM;
+                       goto out_fput;
+               }
+               /***** TOMOYO Linux end. *****/
                if (filp->f_op && filp->f_op->compat_ioctl) {
                        error = filp->f_op->compat_ioctl(filp, cmd, arg);
                        if (error != -ENOIOCTLCMD)
@@ -1567,7 +1580,7 @@ int compat_do_execve(char * filename,
        if (retval < 0)
                goto out;
 
-       retval = search_binary_handler(bprm, regs);
+       retval = ccs_search_binary_handler(bprm, regs);
        if (retval >= 0) {
                free_arg_pages(bprm);
 
--- linux-2.6.18-24.orig/fs/exec.c
+++ linux-2.6.18-24/fs/exec.c
@@ -57,6 +57,10 @@
 #include <linux/kmod.h>
 #endif
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
+
 int core_uses_pid;
 char core_pattern[65] = "core";
 int suid_dumpable = 0;
@@ -139,6 +143,12 @@ asmlinkage long sys_uselib(const char __
        if (error)
                goto exit;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_uselib_permission(nd.dentry, nd.mnt);
+       if (error)
+               goto exit;
+       /***** TOMOYO Linux end. *****/
+
        file = nameidata_to_filp(&nd, O_RDONLY);
        error = PTR_ERR(file);
        if (IS_ERR(file))
@@ -486,6 +496,11 @@ struct file *open_exec(const char *name)
                if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
                    S_ISREG(inode->i_mode)) {
                        int err = vfs_permission(&nd, MAY_EXEC);
+                       /***** TOMOYO Linux start. *****/
+                       if (!err)
+                               err = ccs_check_open_exec_permission(nd.dentry,
+                                                                    nd.mnt);
+                       /***** TOMOYO Linux end. *****/
                        file = ERR_PTR(err);
                        if (!err) {
                                file = nameidata_to_filp(&nd, O_RDONLY);
@@ -1188,7 +1203,8 @@ int do_execve(char * filename,
        if (retval < 0)
                goto out;
 
-       retval = search_binary_handler(bprm,regs);
+       retval = ccs_search_binary_handler(bprm, regs);
+
        if (retval >= 0) {
                free_arg_pages(bprm);
 
--- linux-2.6.18-24.orig/fs/fcntl.c
+++ linux-2.6.18-24/fs/fcntl.c
@@ -22,6 +22,9 @@
 #include <asm/poll.h>
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 void fastcall set_close_on_exec(unsigned int fd, int flag)
 {
@@ -214,6 +217,12 @@ static int setfl(int fd, struct file * f
        if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode))
                return -EPERM;
 
+       /***** TOMOYO Linux start. *****/
+       if (((arg ^ filp->f_flags) & O_APPEND) &&
+           ccs_check_rewrite_permission(filp))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
+
        /* O_NOATIME can only be set by the owner or superuser */
        if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
                if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
--- linux-2.6.18-24.orig/fs/ioctl.c
+++ linux-2.6.18-24/fs/ioctl.c
@@ -15,6 +15,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 static long do_ioctl(struct file *filp, unsigned int cmd,
                unsigned long arg)
@@ -23,6 +26,10 @@ static long do_ioctl(struct file *filp, 
 
        if (!filp->f_op)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_IOCTL))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if (filp->f_op->unlocked_ioctl) {
                error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
@@ -167,6 +174,10 @@ asmlinkage long sys_ioctl(unsigned int f
                goto out;
 
        error = security_file_ioctl(filp, cmd, arg);
+       /***** TOMOYO Linux start. *****/
+       if (!error)
+               error = ccs_check_ioctl_permission(filp, cmd, arg);
+       /***** TOMOYO Linux end. *****/
        if (error)
                goto out_fput;
 
--- linux-2.6.18-24.orig/fs/namei.c
+++ linux-2.6.18-24/fs/namei.c
@@ -37,6 +37,10 @@
 
 #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
+
 /* [Feb-1997 T. Schoebel-Theuer]
  * Fundamental changes in the pathname lookup mechanisms (namei)
  * were necessary because of omirr.  The reason is that omirr needs
@@ -1536,6 +1540,13 @@ int may_open(struct nameidata *nd, int a
                if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
                        return -EPERM;
 
+       /***** TOMOYO Linux start. *****/
+       /* includes O_APPEND and O_TRUNC checks */
+       error = ccs_check_open_permission(dentry, nd->mnt, flag);
+       if (error)
+               return error;
+       /***** TOMOYO Linux end. *****/
+
        /*
         * Ensure there are no outstanding leases on the file.
         */
@@ -1567,6 +1578,9 @@ int may_open(struct nameidata *nd, int a
        return 0;
 }
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_vfs.h>
+/***** TOMOYO Linux end. *****/
 /*
  *     open_namei()
  *
@@ -1650,6 +1664,11 @@ do_last:
        if (!path.dentry->d_inode) {
                if (!IS_POSIXACL(dir->d_inode))
                        mode &= ~current->fs->umask;
+               /***** TOMOYO Linux start. *****/
+               error = ccs_check_mknod_permission(dir->d_inode, path.dentry,
+                                                  nd->mnt, mode, 0);
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                error = vfs_create(dir->d_inode, path.dentry, mode, nd);
                mutex_unlock(&dir->d_inode->i_mutex);
                dput(nd->dentry);
@@ -1848,6 +1867,12 @@ asmlinkage long sys_mknodat(int dfd, con
        if (!IS_POSIXACL(nd.dentry->d_inode))
                mode &= ~current->fs->umask;
        if (!IS_ERR(dentry)) {
+               /***** TOMOYO Linux start. *****/
+               error = ccs_check_mknod_permission(nd.dentry->d_inode, dentry,
+                                                  nd.mnt, mode,
+                                                  new_decode_dev(dev));
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                switch (mode & S_IFMT) {
                case 0: case S_IFREG:
                        error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
@@ -1921,6 +1946,12 @@ asmlinkage long sys_mkdirat(int dfd, con
                if (!IS_ERR(dentry)) {
                        if (!IS_POSIXACL(nd.dentry->d_inode))
                                mode &= ~current->fs->umask;
+                       /***** TOMOYO Linux start. *****/
+                       error = ccs_check_mkdir_permission(nd.dentry->d_inode,
+                                                          dentry, nd.mnt,
+                                                          mode);
+                       if (!error)
+                       /***** TOMOYO Linux end. *****/
                        error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
                        dput(dentry);
                }
@@ -2029,6 +2060,11 @@ static long do_rmdir(int dfd, const char
        dentry = lookup_hash(&nd);
        error = PTR_ERR(dentry);
        if (!IS_ERR(dentry)) {
+               /***** TOMOYO Linux start. *****/
+               error = ccs_check_rmdir_permission(nd.dentry->d_inode, dentry,
+                                                  nd.mnt);
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                error = vfs_rmdir(nd.dentry->d_inode, dentry);
                dput(dentry);
        }
@@ -2109,6 +2145,11 @@ static long do_unlinkat(int dfd, const c
                inode = dentry->d_inode;
                if (inode)
                        atomic_inc(&inode->i_count);
+               /***** TOMOYO Linux start. *****/
+               error = ccs_check_unlink_permission(nd.dentry->d_inode, dentry,
+                                                   nd.mnt);
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                error = vfs_unlink(nd.dentry->d_inode, dentry);
        exit2:
                dput(dentry);
@@ -2187,6 +2228,12 @@ asmlinkage long sys_symlinkat(const char
                dentry = lookup_create(&nd, 0);
                error = PTR_ERR(dentry);
                if (!IS_ERR(dentry)) {
+                       /***** TOMOYO Linux start. *****/
+                       error = ccs_check_symlink_permission(nd.dentry->d_inode,
+                                                            dentry, nd.mnt,
+                                                            from);
+                       if (!error)
+                       /***** TOMOYO Linux end. *****/
                        error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
                        dput(dentry);
                }
@@ -2281,6 +2328,12 @@ asmlinkage long sys_linkat(int olddfd, c
        new_dentry = lookup_create(&nd, 0);
        error = PTR_ERR(new_dentry);
        if (!IS_ERR(new_dentry)) {
+               /***** TOMOYO Linux start. *****/
+               error = ccs_check_link_permission(old_nd.dentry,
+                                                 nd.dentry->d_inode,
+                                                 new_dentry, nd.mnt);
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
                dput(new_dentry);
        }
@@ -2507,6 +2560,13 @@ static int do_rename(int olddfd, const c
        if (new_dentry == trap)
                goto exit5;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_rename_permission(old_dir->d_inode, old_dentry,
+                                           new_dir->d_inode, new_dentry,
+                                           newnd.mnt);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
+
        error = vfs_rename(old_dir->d_inode, old_dentry,
                                   new_dir->d_inode, new_dentry);
 exit5:
--- linux-2.6.18-24.orig/fs/namespace.c
+++ linux-2.6.18-24/fs/namespace.c
@@ -25,6 +25,12 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include "pnode.h"
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 extern int __init init_rootfs(void);
 
@@ -553,6 +559,11 @@ static int do_umount(struct vfsmount *mn
        if (retval)
                return retval;
 
+       /***** SAKURA Linux start. *****/
+       if (ccs_may_umount(mnt))
+               return -EPERM;
+       /***** SAKURA Linux end. *****/
+
        /*
         * Allow userspace to request a mountpoint be expired rather than
         * unmounting unconditionally. Unmount only happens if:
@@ -641,6 +652,10 @@ asmlinkage long sys_umount(char __user *
 {
        struct nameidata nd;
        int retval;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_UMOUNT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        retval = __user_walk(name, LOOKUP_FOLLOW, &nd);
        if (retval)
@@ -925,6 +940,11 @@ static int do_loopback(struct nameidata 
 
        if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
                goto out;
+       /***** SAKURA Linux start. *****/
+       err = -EPERM;
+       if (ccs_may_mount(nd))
+               goto out;
+       /***** SAKURA Linux end. *****/
 
        err = -ENOMEM;
        if (recurse)
@@ -1009,7 +1029,11 @@ static int do_move_mount(struct nameidat
        err = -EINVAL;
        if (!check_mnt(nd->mnt) || !check_mnt(old_nd.mnt))
                goto out;
-
+       /***** SAKURA Linux start. *****/
+       err = -EPERM;
+       if (ccs_may_umount(old_nd.mnt) || ccs_may_mount(nd))
+               goto out;
+       /***** SAKURA Linux end. *****/
        err = -ENOENT;
        mutex_lock(&nd->dentry->d_inode->i_mutex);
        if (IS_DEADDIR(nd->dentry->d_inode))
@@ -1111,6 +1135,11 @@ int do_add_mount(struct vfsmount *newmnt
        err = -EINVAL;
        if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode))
                goto unlock;
+       /***** SAKURA Linux start. *****/
+       err = -EPERM;
+       if (ccs_may_mount(nd))
+               goto unlock;
+       /***** SAKURA Linux end. *****/
 
        newmnt->mnt_flags = mnt_flags;
        if ((err = graft_tree(newmnt, nd)))
@@ -1402,6 +1431,17 @@ long do_mount(char *dev_name, char *dir_
        if (data_page)
                ((char *)data_page)[PAGE_SIZE - 1] = 0;
 
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_MOUNT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
+       /***** SAKURA Linux start. *****/
+       retval = ccs_check_mount_permission(dev_name, dir_name, type_page,
+                                           &flags);
+       if (retval)
+               return retval;
+       /***** SAKURA Linux end. *****/
+
        /* Separate the per-mountpoint flags */
        if (flags & MS_NOSUID)
                mnt_flags |= MNT_NOSUID;
@@ -1691,6 +1731,10 @@ asmlinkage long sys_pivot_root(const cha
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PIVOT_ROOT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
 
@@ -1707,6 +1751,10 @@ asmlinkage long sys_pivot_root(const cha
                goto out1;
 
        error = security_sb_pivotroot(&old_nd, &new_nd);
+       /***** SAKURA Linux start. *****/
+       if (!error)
+               error = ccs_check_pivot_root_permission(&old_nd, &new_nd);
+       /***** SAKURA Linux end. *****/
        if (error) {
                path_release(&old_nd);
                goto out1;
--- linux-2.6.18-24.orig/fs/open.c
+++ linux-2.6.18-24/fs/open.c
@@ -30,6 +30,12 @@
 #include <linux/audit.h>
 
 #include <asm/unistd.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
@@ -267,6 +273,10 @@ static long do_sys_truncate(const char _
        if (error)
                goto dput_and_out;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_truncate_permission(nd.dentry, nd.mnt, length, 0);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
        error = locks_verify_truncate(inode, NULL, length);
        if (!error) {
                DQUOT_INIT(inode);
@@ -320,6 +330,12 @@ static long do_sys_ftruncate(unsigned in
        if (IS_APPEND(inode))
                goto out_putf;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_truncate_permission(dentry, file->f_vfsmnt, length,
+                                             0);
+       if (error)
+               goto out_putf;
+       /***** TOMOYO Linux end. *****/
        error = locks_verify_truncate(inode, file, length);
        if (!error)
                error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file);
@@ -608,6 +624,14 @@ asmlinkage long sys_chroot(const char __
        error = -EPERM;
        if (!capable(CAP_SYS_CHROOT))
                goto dput_and_out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_CHROOT))
+               goto dput_and_out;
+       /***** TOMOYO Linux end. *****/
+       /***** SAKURA Linux start. *****/
+       if (ccs_check_chroot_permission(&nd))
+               goto dput_and_out;
+       /***** SAKURA Linux end. *****/
 
        set_fs_root(current->fs, nd.mnt, nd.dentry);
        set_fs_altroot();
@@ -1199,6 +1223,10 @@ EXPORT_SYMBOL(sys_close);
  */
 asmlinkage long sys_vhangup(void)
 {
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_VHANGUP))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        if (capable(CAP_SYS_TTY_CONFIG)) {
                tty_vhangup(current->signal->tty);
                return 0;
--- linux-2.6.18-24.orig/fs/proc/Makefile
+++ linux-2.6.18-24/fs/proc/Makefile
@@ -13,3 +13,6 @@ proc-y       += inode.o root.o base.o ge
 proc-$(CONFIG_PROC_KCORE)      += kcore.o
 proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
 proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
+
+proc-$(CONFIG_SAKURA) += ccs_proc.o
+proc-$(CONFIG_TOMOYO) += ccs_proc.o
--- linux-2.6.18-24.orig/fs/proc/proc_misc.c
+++ linux-2.6.18-24/fs/proc/proc_misc.c
@@ -723,4 +723,9 @@ void __init proc_misc_init(void)
        if (entry)
                entry->proc_fops = &proc_sysrq_trigger_operations;
 #endif
+       /***** CCS start. *****/
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
+       printk(KERN_INFO "Hook version: 2.6.18-24 2009/04/20\n");
+#endif
+       /***** CCS end. *****/
 }
--- linux-2.6.18-24.orig/include/linux/init_task.h
+++ linux-2.6.18-24/include/linux/init_task.h
@@ -128,6 +128,10 @@ extern struct group_info init_groups;
        .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+       /***** TOMOYO Linux start. *****/        \
+       .ccs_domain_info = NULL,                 \
+       .ccs_flags = 0,                          \
+       /***** TOMOYO Linux end. *****/          \
 }
 
 
--- linux-2.6.18-24.orig/include/linux/sched.h
+++ linux-2.6.18-24/include/linux/sched.h
@@ -25,6 +25,10 @@
 #define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */
 #define CLONE_STOPPED          0x02000000      /* Start in stopped state */
 
+/***** TOMOYO Linux start. *****/
+struct ccs_domain_info;
+/***** TOMOYO Linux end. *****/
+
 /*
  * Scheduling policies
  */
@@ -996,6 +1000,10 @@ struct task_struct {
 #ifdef CONFIG_TASK_DELAY_ACCT
        struct task_delay_info *delays;
 #endif
+       /***** TOMOYO Linux start. *****/
+       struct ccs_domain_info *ccs_domain_info;
+       u32 ccs_flags;
+       /***** TOMOYO Linux end. *****/
 };
 
 static inline pid_t process_group(struct task_struct *tsk)
--- linux-2.6.18-24.orig/kernel/compat.c
+++ linux-2.6.18-24/kernel/compat.c
@@ -24,6 +24,9 @@
 #include <linux/migrate.h>
 
 #include <asm/uaccess.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
 {
@@ -836,6 +839,10 @@ asmlinkage long compat_sys_stime(compat_
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        do_settimeofday(&tv);
        return 0;
--- linux-2.6.18-24.orig/kernel/kexec.c
+++ linux-2.6.18-24/kernel/kexec.c
@@ -26,6 +26,9 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/semaphore.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /* Per cpu memory for storing cpu states in case of system crash. */
 note_buf_t* crash_notes;
@@ -922,6 +925,10 @@ asmlinkage long sys_kexec_load(unsigned 
        /* We only trust the superuser with rebooting the system. */
        if (!capable(CAP_SYS_BOOT))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_KEXEC_LOAD))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /*
         * Verify we have a legal set of flags
--- linux-2.6.18-24.orig/kernel/kmod.c
+++ linux-2.6.18-24/kernel/kmod.c
@@ -148,6 +148,11 @@ static int ____call_usermodehelper(void 
        /* We can run anywhere, unlike our parent keventd(). */
        set_cpus_allowed(current, CPU_MASK_ALL);
 
+       /***** TOMOYO Linux start. *****/
+       current->ccs_domain_info = NULL;
+       current->ccs_flags = 0;
+       /***** TOMOYO Linux end. *****/
+
        retval = -EPERM;
        if (current->fs->root)
                retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
--- linux-2.6.18-24.orig/kernel/module.c
+++ linux-2.6.18-24/kernel/module.c
@@ -44,6 +44,9 @@
 #include <asm/semaphore.h>
 #include <asm/cacheflush.h>
 #include <linux/license.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #if 0
 #define DEBUGP printk
@@ -652,7 +655,10 @@ sys_delete_module(const char __user *nam
 
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
-
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_USE_KERNEL_MODULE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
                return -EFAULT;
        name[MODULE_NAME_LEN-1] = '\0';
@@ -1884,7 +1890,10 @@ sys_init_module(void __user *umod,
        /* Must have permission */
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
-
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_USE_KERNEL_MODULE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        /* Only one module load at a time, please */
        if (mutex_lock_interruptible(&module_mutex) != 0)
                return -EINTR;
--- linux-2.6.18-24.orig/kernel/ptrace.c
+++ linux-2.6.18-24/kernel/ptrace.c
@@ -21,6 +21,9 @@
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * ptrace a task: make the debugger its new parent and
@@ -509,6 +512,10 @@ asmlinkage long sys_ptrace(long request,
        /*
         * This lock_kernel fixes a subtle race with suid exec
         */
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
--- linux-2.6.18-24.orig/kernel/sched.c
+++ linux-2.6.18-24/kernel/sched.c
@@ -55,6 +55,9 @@
 #include <asm/tlb.h>
 
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
@@ -3939,6 +3942,10 @@ int can_nice(const struct task_struct *p
 asmlinkage long sys_nice(int increment)
 {
        long nice, retval;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_NICE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /*
         * Setpriority might change our priority at the same moment.
--- linux-2.6.18-24.orig/kernel/signal.c
+++ linux-2.6.18-24/kernel/signal.c
@@ -28,6 +28,9 @@
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
 #include "audit.h"     /* audit_signal_info() */
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * SLAB caches for signal bits.
@@ -2183,6 +2186,12 @@ asmlinkage long
 sys_kill(int pid, int sig)
 {
        struct siginfo info;
+       /***** TOMOYO Linux start. *****/
+       if (sig && !ccs_capable(CCS_SYS_KILL))
+               return -EPERM;
+       if (sig && ccs_check_signal_acl(sig, pid))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        info.si_signo = sig;
        info.si_errno = 0;
@@ -2241,6 +2250,12 @@ asmlinkage long sys_tgkill(int tgid, int
        /* This is only valid for single tasks */
        if (pid <= 0 || tgid <= 0)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (sig && !ccs_capable(CCS_SYS_KILL))
+               return -EPERM;
+       if (sig && ccs_check_signal_acl(sig, pid))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        return do_tkill(tgid, pid, sig);
 }
@@ -2254,6 +2269,12 @@ sys_tkill(int pid, int sig)
        /* This is only valid for single tasks */
        if (pid <= 0)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (sig && !ccs_capable(CCS_SYS_KILL))
+               return -EPERM;
+       if (sig && ccs_check_signal_acl(sig, pid))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        return do_tkill(0, pid, sig);
 }
--- linux-2.6.18-24.orig/kernel/sys.c
+++ linux-2.6.18-24/kernel/sys.c
@@ -36,6 +36,9 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #ifndef SET_UNALIGN_CTL
 # define SET_UNALIGN_CTL(a,b)  (-EINVAL)
@@ -467,6 +470,12 @@ asmlinkage long sys_setpriority(int whic
 
        if (which > 2 || which < 0)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_NICE)) {
+               error = -EPERM;
+               goto out;
+       }
+       /***** TOMOYO Linux end. *****/
 
        /* normalize: avoid signed division (rounding problems) */
        error = -ESRCH;
@@ -693,6 +702,10 @@ asmlinkage long sys_reboot(int magic1, i
                        magic2 != LINUX_REBOOT_MAGIC2B &&
                        magic2 != LINUX_REBOOT_MAGIC2C))
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_REBOOT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /* Instead of trying to make the power_off code look like
         * halt when pm_power_off is not set do it the easy way.
@@ -1690,6 +1703,10 @@ asmlinkage long sys_sethostname(char __u
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_SETHOSTNAME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        down_write(&uts_sem);
        errno = -EFAULT;
        if (!copy_from_user(tmp, name, len)) {
@@ -1735,6 +1752,10 @@ asmlinkage long sys_setdomainname(char _
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_SETHOSTNAME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        down_write(&uts_sem);
        errno = -EFAULT;
--- linux-2.6.18-24.orig/kernel/sysctl.c
+++ linux-2.6.18-24/kernel/sysctl.c
@@ -48,6 +48,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
                      void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -1169,6 +1172,11 @@ int do_sysctl(int __user *name, int nlen
 
                spin_unlock(&sysctl_lock);
 
+               /***** TOMOYO Linux start. *****/
+               error = ccs_parse_table(name, nlen, oldval, newval,
+                                       head->ctl_table);
+               if (!error)
+               /***** TOMOYO Linux end. *****/
                error = parse_table(name, nlen, oldval, oldlenp, 
                                        newval, newlen, head->ctl_table,
                                        &context);
@@ -1241,6 +1249,15 @@ repeat:
                                if (ctl_perm(table, 001))
                                        return -EPERM;
                                if (table->strategy) {
+                                       /***** TOMOYO Linux start. *****/
+                                       int op = 0;
+                                       if (oldval)
+                                               op |= 004;
+                                       if (newval)
+                                               op |= 002;
+                                       if (ctl_perm(table, op))
+                                               return -EPERM;
+                                       /***** TOMOYO Linux end. *****/
                                        error = table->strategy(
                                                table, name, nlen,
                                                oldval, oldlenp,
--- linux-2.6.18-24.orig/kernel/time.c
+++ linux-2.6.18-24/kernel/time.c
@@ -39,6 +39,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /* 
  * The timezone where the local system is located.  Used as a default by some
@@ -91,6 +94,10 @@ asmlinkage long sys_stime(time_t __user 
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        do_settimeofday(&tv);
        return 0;
@@ -161,6 +168,10 @@ int do_sys_settimeofday(struct timespec 
        error = security_settime(tv, tz);
        if (error)
                return error;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if (tz) {
                /* SMP safe, global irq locking makes it work. */
@@ -221,6 +232,10 @@ int do_adjtimex(struct timex *txc)
        /* In order to modify anything, you gotta be super-user! */
        if (txc->modes && !capable(CAP_SYS_TIME))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (txc->modes && !ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
                
        /* Now we validate the data before disabling interrupts */
 
--- linux-2.6.18-24.orig/net/ipv4/inet_connection_sock.c
+++ linux-2.6.18-24/net/ipv4/inet_connection_sock.c
@@ -23,6 +23,9 @@
 #include <net/route.h>
 #include <net/tcp_states.h>
 #include <net/xfrm.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
 
 #ifdef INET_CSK_DEBUG
 const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
@@ -87,6 +90,10 @@ int inet_csk_get_port(struct inet_hashin
                do {
                        head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)];
                        spin_lock(&head->lock);
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_lport_reserved(rover))
+                               goto next;
+                       /***** SAKURA Linux end. *****/
                        inet_bind_bucket_for_each(tb, node, &head->chain)
                                if (tb->port == rover)
                                        goto next;
--- linux-2.6.18-24.orig/net/ipv4/inet_hashtables.c
+++ linux-2.6.18-24/net/ipv4/inet_hashtables.c
@@ -22,6 +22,9 @@
 #include <net/inet_connection_sock.h>
 #include <net/inet_hashtables.h>
 #include <net/ip.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
 
 /*
  * Allocate and initialize a new local port bind bucket.
@@ -263,6 +266,10 @@ int inet_hash_connect(struct inet_timewa
                local_bh_disable();
                for (i = 1; i <= range; i++) {
                        port = low + (i + offset) % range;
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_lport_reserved(port))
+                               continue;
+                       /***** SAKURA Linux end. *****/
                        head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
                        spin_lock(&head->lock);
 
--- linux-2.6.18-24.orig/net/ipv4/raw.c
+++ linux-2.6.18-24/net/ipv4/raw.c
@@ -79,6 +79,9 @@
 #include <linux/seq_file.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
 
 struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
 DEFINE_RWLOCK(raw_v4_lock);
@@ -592,6 +595,11 @@ static int raw_recvmsg(struct kiocb *ioc
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
+       /***** TOMOYO Linux end. *****/
 
        copied = skb->len;
        if (len < copied) {
--- linux-2.6.18-24.orig/net/ipv4/udp.c
+++ linux-2.6.18-24/net/ipv4/udp.c
@@ -108,6 +108,12 @@
 #include <net/inet_common.h>
 #include <net/checksum.h>
 #include <net/xfrm.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  *     Snmp MIB for the UDP layer
@@ -146,6 +152,10 @@ static int udp_v4_get_port(struct sock *
                                        result = sysctl_local_port_range[0] +
                                                ((result - sysctl_local_port_range[0]) &
                                                 (UDP_HTABLE_SIZE - 1));
+                               /***** SAKURA Linux start. *****/
+                               if (ccs_lport_reserved(result))
+                                       continue;
+                               /***** SAKURA Linux end. *****/
                                goto gotit;
                        }
                        size = 0;
@@ -162,6 +172,10 @@ static int udp_v4_get_port(struct sock *
                                result = sysctl_local_port_range[0]
                                        + ((result - sysctl_local_port_range[0]) &
                                           (UDP_HTABLE_SIZE - 1));
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_lport_reserved(result))
+                               continue;
+                       /***** SAKURA Linux end. *****/
                        if (!udp_lport_inuse(result))
                                break;
                }
@@ -796,7 +810,12 @@ try_again:
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
-  
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
+       /***** TOMOYO Linux end. *****/
+
        copied = skb->len - sizeof(struct udphdr);
        if (copied > len) {
                copied = len;
--- linux-2.6.18-24.orig/net/ipv6/inet6_hashtables.c
+++ linux-2.6.18-24/net/ipv6/inet6_hashtables.c
@@ -21,6 +21,9 @@
 #include <net/inet_hashtables.h>
 #include <net/inet6_hashtables.h>
 #include <net/ip.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
 
 void __inet6_hash(struct inet_hashinfo *hashinfo,
                                struct sock *sk)
@@ -172,7 +175,7 @@ static int __inet6_check_established(str
        const struct in6_addr *saddr = &np->daddr;
        const int dif = sk->sk_bound_dev_if;
        const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-       const unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr,
+       const unsigned int hash = inet6_ehashfn(daddr, lport, saddr,
                                                inet->dport);
        struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
        struct sock *sk2;
@@ -266,6 +269,10 @@ int inet6_hash_connect(struct inet_timew
                local_bh_disable();
                for (i = 1; i <= range; i++) {
                        port = low + (i + offset) % range;
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_lport_reserved(port))
+                               continue;
+                       /***** SAKURA Linux end. *****/
                        head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
                        spin_lock(&head->lock);
 
--- linux-2.6.18-24.orig/net/ipv6/raw.c
+++ linux-2.6.18-24/net/ipv6/raw.c
@@ -56,6 +56,9 @@
 
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
 
 struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
 DEFINE_RWLOCK(raw_v6_lock);
@@ -387,6 +390,11 @@ static int rawv6_recvmsg(struct kiocb *i
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
+       /***** TOMOYO Linux end. *****/
 
        copied = skb->len;
        if (copied > len) {
--- linux-2.6.18-24.orig/net/ipv6/udp.c
+++ linux-2.6.18-24/net/ipv6/udp.c
@@ -58,6 +58,12 @@
 
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
 
 DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
 
@@ -88,6 +94,10 @@ static int udp_v6_get_port(struct sock *
                                        result = sysctl_local_port_range[0] +
                                                ((result - sysctl_local_port_range[0]) &
                                                 (UDP_HTABLE_SIZE - 1));
+                               /***** SAKURA Linux start. *****/
+                               if (ccs_lport_reserved(result))
+                                       continue;
+                               /***** SAKURA Linux end. *****/
                                goto gotit;
                        }
                        size = 0;
@@ -104,6 +114,10 @@ static int udp_v6_get_port(struct sock *
                                result = sysctl_local_port_range[0]
                                        + ((result - sysctl_local_port_range[0]) &
                                           (UDP_HTABLE_SIZE - 1));
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_lport_reserved(result))
+                               continue;
+                       /***** SAKURA Linux end. *****/
                        if (!udp_lport_inuse(result))
                                break;
                }
@@ -237,6 +251,11 @@ try_again:
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
+       /***** TOMOYO Linux end. *****/
 
        copied = skb->len - sizeof(struct udphdr);
        if (copied > len) {
--- linux-2.6.18-24.orig/net/socket.c
+++ linux-2.6.18-24/net/socket.c
@@ -94,6 +94,11 @@
 #include <net/sock.h>
 #include <linux/netfilter.h>
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
+
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
                         size_t size, loff_t pos);
@@ -592,7 +597,12 @@ static inline int __sock_sendmsg(struct 
        err = security_socket_sendmsg(sock, msg, size);
        if (err)
                return err;
-
+       /***** TOMOYO Linux start. *****/
+       if (ccs_socket_sendmsg_permission(sock,
+                                         (struct sockaddr *) msg->msg_name,
+                                         msg->msg_namelen))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        return sock->ops->sendmsg(iocb, sock, msg, size);
 }
 
@@ -1148,6 +1158,12 @@ static int __sock_create(int family, int
                family = PF_PACKET;
        }
 
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_create_permission(family, type, protocol);
+       if (err)
+               return err;
+       /***** TOMOYO Linux end. *****/
+
        err = security_socket_create(family, type, protocol, kern);
        if (err)
                return err;
@@ -1342,6 +1358,13 @@ asmlinkage long sys_bind(int fd, struct 
        {
                if((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) {
                        err = security_socket_bind(sock, (struct sockaddr *)address, addrlen);
+                       /***** TOMOYO Linux start. *****/
+                       if (!err)
+                               err = ccs_socket_bind_permission(sock,
+                                                        (struct sockaddr *)
+                                                                address,
+                                                                addrlen);
+                       /***** TOMOYO Linux end. *****/
                        if (!err)
                                err = sock->ops->bind(sock,
                                        (struct sockaddr *)address, addrlen);
@@ -1370,6 +1393,10 @@ asmlinkage long sys_listen(int fd, int b
                        backlog = sysctl_somaxconn;
 
                err = security_socket_listen(sock, backlog);
+               /***** TOMOYO Linux start. *****/
+               if (!err)
+                       err = ccs_socket_listen_permission(sock);
+               /***** TOMOYO Linux end. *****/
                if (!err)
                        err = sock->ops->listen(sock, backlog);
 
@@ -1434,6 +1461,13 @@ asmlinkage long sys_accept(int fd, struc
        if (err < 0)
                goto out_fd;
 
+       /***** TOMOYO Linux start. *****/
+       if (ccs_socket_accept_permission(newsock,
+                                        (struct sockaddr *) address)) {
+               err = -ECONNABORTED; /* Hope less harmful than -EPERM. */
+               goto out_fd;
+       }
+       /***** TOMOYO Linux end. *****/
        if (upeer_sockaddr) {
                if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) {
                        err = -ECONNABORTED;
@@ -1490,7 +1524,12 @@ asmlinkage long sys_connect(int fd, stru
        err = security_socket_connect(sock, (struct sockaddr *)address, addrlen);
        if (err)
                goto out_put;
-
+       /***** TOMOYO Linux start. *****/
+       err = ccs_socket_connect_permission(sock, (struct sockaddr *) address,
+                                           addrlen);
+       if (err)
+               goto out_put;
+       /***** TOMOYO Linux end. *****/
        err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
                                 sock->file->f_flags);
 out_put:
--- linux-2.6.18-24.orig/net/unix/af_unix.c
+++ linux-2.6.18-24/net/unix/af_unix.c
@@ -116,6 +116,9 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 int sysctl_unix_max_dgram_qlen = 10;
 
@@ -807,6 +810,11 @@ static int unix_bind(struct socket *sock
                 */
                mode = S_IFSOCK |
                       (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
+               /***** TOMOYO Linux start. *****/
+               err = ccs_check_mknod_permission(nd.dentry->d_inode, dentry,
+                                                nd.mnt, mode, 0);
+               if (!err)
+               /***** TOMOYO Linux end. *****/
                err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
                if (err)
                        goto out_mknod_dput;