ccs-patch/patches/ccs-patch-2.6.25-suse-11.0.diff

This is TOMOYO Linux patch for openSUSE 11.0.

Source code for this patch is http://download.opensuse.org/update/11.0/rpm/i586/kernel-source-2.6.25.20-0.1.i586.rpm
---
 arch/ia64/ia32/sys_ia32.c       |    9 ++
 arch/mips/kernel/ptrace32.c     |    9 ++
 arch/s390/kernel/ptrace.c       |    9 ++
 arch/x86/kernel/ptrace.c        |    9 ++
 fs/Kconfig                      |    2 
 fs/Makefile                     |    2 
 fs/attr.c                       |   19 ++++++
 fs/compat.c                     |    5 +
 fs/compat_ioctl.c               |    9 ++
 fs/exec.c                       |   20 ++++++
 fs/fcntl.c                      |    9 ++
 fs/ioctl.c                      |    7 ++
 fs/namei.c                      |  122 ++++++++++++++++++++++++++++++++++++++++
 fs/namespace.c                  |   49 ++++++++++++++++
 fs/open.c                       |   29 +++++++++
 fs/proc/Makefile                |    3 
 fs/proc/proc_misc.c             |    5 +
 include/linux/init_task.h       |    4 +
 include/linux/sched.h           |    9 ++
 kernel/compat.c                 |    7 ++
 kernel/kexec.c                  |    7 ++
 kernel/kmod.c                   |    5 +
 kernel/module.c                 |   11 +++
 kernel/ptrace.c                 |   15 ++++
 kernel/sched.c                  |    7 ++
 kernel/signal.c                 |   21 ++++++
 kernel/sys.c                    |   21 ++++++
 kernel/sysctl.c                 |   95 +++++++++++++++++++++++++++++++
 kernel/time.c                   |   11 +++
 kernel/time/ntp.c               |    7 ++
 net/core/datagram.c             |   11 +++
 net/ipv4/inet_connection_sock.c |    7 ++
 net/ipv4/inet_hashtables.c      |    7 ++
 net/ipv4/udp.c                  |   10 +++
 net/socket.c                    |   41 +++++++++++++
 net/unix/af_unix.c              |   15 ++++
 36 files changed, 626 insertions(+), 2 deletions(-)

--- linux-2.6.25.20-0.1.orig/arch/ia64/ia32/sys_ia32.c
+++ linux-2.6.25.20-0.1/arch/ia64/ia32/sys_ia32.c
@@ -50,6 +50,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"
 
@@ -1753,6 +1756,12 @@ sys32_ptrace (int request, pid_t pid, un
        struct task_struct *child;
        unsigned int value, tmp;
        long i, ret;
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
        if (request == PTRACE_TRACEME) {
--- linux-2.6.25.20-0.1.orig/arch/mips/kernel/ptrace32.c
+++ linux-2.6.25.20-0.1/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,12 @@ asmlinkage int sys32_ptrace(int request,
 {
        struct task_struct *child;
        int ret;
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
 
 #if 0
        printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
--- linux-2.6.25.20-0.1.orig/arch/s390/kernel/ptrace.c
+++ linux-2.6.25.20-0.1/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"
@@ -698,6 +701,12 @@ sys_ptrace(long request, long pid, long 
        struct task_struct *child;
        int ret;
 
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                 ret = ptrace_traceme();
--- linux-2.6.25.20-0.1.orig/arch/x86/kernel/ptrace.c
+++ linux-2.6.25.20-0.1/arch/x86/kernel/ptrace.c
@@ -32,6 +32,9 @@
 #include <asm/prctl.h>
 #include <asm/proto.h>
 #include <asm/ds.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "tls.h"
 
@@ -1240,6 +1243,12 @@ asmlinkage long sys32_ptrace(long reques
        void __user *datap = compat_ptr(data);
        int ret;
        __u32 val;
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
 
        switch (request) {
        case PTRACE_TRACEME:
--- linux-2.6.25.20-0.1.orig/fs/Kconfig
+++ linux-2.6.25.20-0.1/fs/Kconfig
@@ -2187,4 +2187,6 @@ endif
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
+source "fs/Kconfig.ccs"
+
 endmenu
--- linux-2.6.25.20-0.1.orig/fs/Makefile
+++ linux-2.6.25.20-0.1/fs/Makefile
@@ -125,3 +125,5 @@ obj-$(CONFIG_OCFS2_FS)              += ocfs2/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
 obj-$(CONFIG_NOVFS)            += novfs/
 obj-$(CONFIG_SQUASHFS)         += squashfs/
+
+include $(srctree)/fs/Makefile-2.6.ccs
--- linux-2.6.25.20-0.1.orig/fs/attr.c
+++ linux-2.6.25.20-0.1/fs/attr.c
@@ -14,6 +14,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... */
 
@@ -160,6 +163,14 @@ int fnotify_change(struct dentry *dentry
 
        if (inode->i_op && inode->i_op->setattr) {
                error = security_inode_setattr(dentry, mnt, attr);
+               /***** TOMOYO Linux start. *****/
+               if (!error && (ia_valid & ATTR_MODE) &&
+                   !ccs_capable(TOMOYO_SYS_CHMOD))
+                       error = -EPERM;
+               if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) &&
+                   !ccs_capable(TOMOYO_SYS_CHOWN))
+                       error = -EPERM;
+               /***** TOMOYO Linux end. *****/
                if (!error) {
                        if (file && file->f_op && file->f_op->fsetattr)
                                error = file->f_op->fsetattr(file, attr);
@@ -181,6 +192,14 @@ int fnotify_change(struct dentry *dentry
                error = inode_change_ok(inode, attr);
                if (!error)
                        error = security_inode_setattr(dentry, mnt, attr);
+               /***** TOMOYO Linux start. *****/
+               if (!error && (ia_valid & ATTR_MODE) &&
+                   !ccs_capable(TOMOYO_SYS_CHMOD))
+                       error = -EPERM;
+               if (!error && (ia_valid & (ATTR_UID | ATTR_GID)) &&
+                   !ccs_capable(TOMOYO_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.25.20-0.1.orig/fs/compat.c
+++ linux-2.6.25.20-0.1/fs/compat.c
@@ -55,6 +55,9 @@
 #include <asm/mmu_context.h>
 #include <asm/ioctls.h>
 #include "internal.h"
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 int compat_log = 1;
 
@@ -1399,7 +1402,7 @@ int compat_do_execve(char * filename,
        if (retval < 0)
                goto out;
 
-       retval = search_binary_handler(bprm, regs);
+       retval = search_binary_handler_with_transition(bprm, regs);
        if (retval >= 0) {
                /* execve success */
                security_bprm_free(bprm);
--- linux-2.6.25.20-0.1.orig/fs/compat_ioctl.c
+++ linux-2.6.25.20-0.1/fs/compat_ioctl.c
@@ -120,6 +120,9 @@
 #include <xen/public/privcmd.h>
 #include <xen/compat_ioctl.h>
 #endif
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
                              unsigned long arg, struct file *f)
@@ -2930,6 +2933,12 @@ asmlinkage long compat_sys_ioctl(unsigne
                /*FALL THROUGH*/
 
        default:
+               /***** TOMOYO Linux start. *****/
+               if (!ccs_capable(TOMOYO_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)
--- linux-2.6.25.20-0.1.orig/fs/exec.c
+++ linux-2.6.25.20-0.1/fs/exec.c
@@ -60,6 +60,10 @@
 #include <linux/kmod.h>
 #endif
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
+
 int core_uses_pid;
 char core_pattern[CORENAME_MAX_SIZE] = "core";
 int suid_dumpable = 0;
@@ -118,6 +122,12 @@ asmlinkage long sys_uselib(const char __
        error = vfs_permission(&nd, MAY_READ | MAY_EXEC);
        if (error)
                goto exit;
+       /***** TOMOYO Linux start. *****/
+       /* 01 means "read". */
+       error = ccs_check_open_permission(nd.path.dentry, nd.path.mnt, 01);
+       if (error)
+               goto exit;
+       /***** TOMOYO Linux end. *****/
 
        file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE);
        error = PTR_ERR(file);
@@ -664,6 +674,14 @@ struct file *open_exec(const char *name)
                file = ERR_PTR(-EACCES);
                if (S_ISREG(inode->i_mode)) {
                        int err = vfs_permission(&nd, MAY_EXEC);
+                       /***** TOMOYO Linux start. *****/
+                       if (!err && (current->tomoyo_flags &
+                                    TOMOYO_CHECK_READ_FOR_OPEN_EXEC))
+                               /* 01 means "read". */
+                               err = ccs_check_open_permission(nd.path.dentry,
+                                                               nd.path.mnt,
+                                                               01);
+                       /***** TOMOYO Linux end. *****/
                        file = ERR_PTR(err);
                        if (!err) {
                                file = nameidata_to_filp(&nd,
@@ -1336,7 +1354,7 @@ int do_execve(char * filename,
                goto out;
        bprm->argv_len = env_p - bprm->p;
 
-       retval = search_binary_handler(bprm,regs);
+       retval = search_binary_handler_with_transition(bprm, regs);
        if (retval >= 0) {
                /* execve success */
                free_arg_pages(bprm);
--- linux-2.6.25.20-0.1.orig/fs/fcntl.c
+++ linux-2.6.25.20-0.1/fs/fcntl.c
@@ -23,6 +23,9 @@
 #include <asm/poll.h>
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 void set_close_on_exec(unsigned int fd, int flag)
 {
@@ -217,6 +220,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 (!is_owner_or_cap(inode))
--- linux-2.6.25.20-0.1.orig/fs/ioctl.c
+++ linux-2.6.25.20-0.1/fs/ioctl.c
@@ -15,6 +15,9 @@
 #include <linux/uaccess.h>
 
 #include <asm/ioctls.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /**
  * vfs_ioctl - call filesystem specific ioctl methods
@@ -35,6 +38,10 @@ long vfs_ioctl(struct file *filp, unsign
 
        if (!filp->f_op)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_IOCTL))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if (filp->f_op->unlocked_ioctl) {
                error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
--- linux-2.6.25.20-0.1.orig/fs/namei.c
+++ linux-2.6.25.20-0.1/fs/namei.c
@@ -35,6 +35,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
@@ -1635,6 +1639,14 @@ int vfs_create(struct inode *dir, struct
        error = security_inode_create(dir, dentry, nd ? nd->path.mnt : NULL, mode);
        if (error)
                return error;
+       /***** TOMOYO Linux start. *****/
+       if (nd) {
+               error = ccs_check_1path_perm(TYPE_CREATE_ACL, dentry,
+                                            nd->path.mnt);
+               if (error)
+                       return error;
+       }
+       /***** TOMOYO Linux end. *****/
        DQUOT_INIT(dir);
        error = dir->i_op->create(dir, dentry, mode, nd);
        if (!error)
@@ -1690,6 +1702,13 @@ int may_open(struct nameidata *nd, int a
                if (!is_owner_or_cap(inode))
                        return -EPERM;
 
+       /***** TOMOYO Linux start. *****/
+       /* includes O_APPEND and O_TRUNC checks */
+       error = ccs_check_open_permission(dentry, nd->path.mnt, flag);
+       if (error)
+               return error;
+       /***** TOMOYO Linux end. *****/
+
        /*
         * Ensure there are no outstanding leases on the file.
         */
@@ -1741,6 +1760,9 @@ static int open_namei_create(struct name
        return may_open(nd, 0, flag & ~O_TRUNC);
 }
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo_vfs.h>
+/***** TOMOYO Linux end. *****/
 /*
  *     open_namei()
  *
@@ -2006,6 +2028,16 @@ asmlinkage long sys_mknodat(int dfd, con
 
        if (S_ISDIR(mode))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (S_ISCHR(mode) && !ccs_capable(TOMOYO_CREATE_CHAR_DEV))
+               return -EPERM;
+       if (S_ISBLK(mode) && !ccs_capable(TOMOYO_CREATE_BLOCK_DEV))
+               return -EPERM;
+       if (S_ISFIFO(mode) && !ccs_capable(TOMOYO_CREATE_FIFO))
+               return -EPERM;
+       if (S_ISSOCK(mode) && !ccs_capable(TOMOYO_CREATE_UNIX_SOCKET))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        tmp = getname(filename);
        if (IS_ERR(tmp))
                return PTR_ERR(tmp);
@@ -2024,10 +2056,34 @@ asmlinkage long sys_mknodat(int dfd, con
                        error = vfs_create(nd.path.dentry->d_inode,dentry,mode,&nd);
                        break;
                case S_IFCHR: case S_IFBLK:
+                       /***** TOMOYO Linux start. *****/
+                       error = pre_vfs_mknod(nd.path.dentry->d_inode, dentry,
+                                             mode);
+                       if (error)
+                               break;
+                       error = ccs_check_1path_perm(S_ISCHR(mode) ?
+                                                    TYPE_MKCHAR_ACL :
+                                                    TYPE_MKBLOCK_ACL,
+                                                    dentry, nd.path.mnt);
+                       if (error)
+                               break;
+                       /***** TOMOYO Linux end. *****/
                        error = vfs_mknod(nd.path.dentry->d_inode, dentry,
                                          nd.path.mnt, mode, new_decode_dev(dev));
                        break;
                case S_IFIFO: case S_IFSOCK:
+                       /***** TOMOYO Linux start. *****/
+                       error = pre_vfs_mknod(nd.path.dentry->d_inode, dentry,
+                                             mode);
+                       if (error)
+                               break;
+                       error = ccs_check_1path_perm(S_ISFIFO(mode) ?
+                                                    TYPE_MKFIFO_ACL :
+                                                    TYPE_MKSOCK_ACL,
+                                                    dentry, nd.path.mnt);
+                       if (error)
+                               break;
+                       /***** TOMOYO Linux end. *****/
                        error = vfs_mknod(nd.path.dentry->d_inode, dentry,
                                          nd.path.mnt, mode, 0);
                        break;
@@ -2097,6 +2153,13 @@ asmlinkage long sys_mkdirat(int dfd, con
 
        if (!IS_POSIXACL(nd.path.dentry->d_inode))
                mode &= ~current->fs->umask;
+       /***** TOMOYO Linux start. *****/
+       error = pre_vfs_mkdir(nd.path.dentry->d_inode, dentry);
+       if (!error)
+               error = ccs_check_1path_perm(TYPE_MKDIR_ACL, dentry,
+                                            nd.path.mnt);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
        error = vfs_mkdir(nd.path.dentry->d_inode, dentry, nd.path.mnt, mode);
        dput(dentry);
 out_unlock:
@@ -2205,6 +2268,13 @@ static long do_rmdir(int dfd, const char
        error = PTR_ERR(dentry);
        if (IS_ERR(dentry))
                goto exit2;
+       /***** TOMOYO Linux start. *****/
+       error = pre_vfs_rmdir(nd.path.dentry->d_inode, dentry);
+       if (!error)
+               error = ccs_check_1path_perm(TYPE_RMDIR_ACL, dentry,
+                                            nd.path.mnt);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry, nd.path.mnt);
        dput(dentry);
 exit2:
@@ -2265,6 +2335,10 @@ static long do_unlinkat(int dfd, const c
        struct dentry *dentry;
        struct nameidata nd;
        struct inode *inode = NULL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_UNLINK))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        name = getname(pathname);
        if(IS_ERR(name))
@@ -2286,6 +2360,15 @@ static long do_unlinkat(int dfd, const c
                inode = dentry->d_inode;
                if (inode)
                        atomic_inc(&inode->i_count);
+               /***** TOMOYO Linux start. *****/
+               error = pre_vfs_unlink(nd.path.dentry->d_inode, dentry);
+               if (error)
+                       goto exit2;
+               error = ccs_check_1path_perm(TYPE_UNLINK_ACL, dentry,
+                                            nd.path.mnt);
+               if (error)
+                       goto exit2;
+               /***** TOMOYO Linux end. *****/
                error = vfs_unlink(nd.path.dentry->d_inode, dentry, nd.path.mnt);
        exit2:
                dput(dentry);
@@ -2351,6 +2434,10 @@ asmlinkage long sys_symlinkat(const char
        char * to;
        struct dentry *dentry;
        struct nameidata nd;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SYMLINK))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        from = getname(oldname);
        if(IS_ERR(from))
@@ -2368,6 +2455,13 @@ asmlinkage long sys_symlinkat(const char
        if (IS_ERR(dentry))
                goto out_unlock;
 
+       /***** TOMOYO Linux start. *****/
+       error = pre_vfs_symlink(nd.path.dentry->d_inode, dentry);
+       if (!error)
+               error = ccs_check_1path_perm(TYPE_SYMLINK_ACL, dentry,
+                                            nd.path.mnt);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
        error = vfs_symlink(nd.path.dentry->d_inode, dentry, nd.path.mnt, from,
                            S_IALLUGO);
        dput(dentry);
@@ -2442,6 +2536,10 @@ asmlinkage long sys_linkat(int olddfd, c
        struct nameidata nd, old_nd;
        int error;
        char * to;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_LINK))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if ((flags & ~AT_SYMLINK_FOLLOW) != 0)
                return -EINVAL;
@@ -2465,6 +2563,15 @@ asmlinkage long sys_linkat(int olddfd, c
        error = PTR_ERR(new_dentry);
        if (IS_ERR(new_dentry))
                goto out_unlock;
+       /***** TOMOYO Linux start. *****/
+       error = pre_vfs_link(old_nd.path.dentry, nd.path.dentry->d_inode,
+                            new_dentry);
+       if (!error)
+               error = ccs_check_2path_perm(TYPE_LINK_ACL, old_nd.path.dentry,
+                                            old_nd.path.mnt, new_dentry,
+                                            nd.path.mnt);
+       if (!error)
+       /***** TOMOYO Linux end. *****/
        error = vfs_link(old_nd.path.dentry, old_nd.path.mnt, nd.path.dentry->d_inode,
                         new_dentry, nd.path.mnt);
        dput(new_dentry);
@@ -2698,6 +2805,17 @@ static int do_rename(int olddfd, const c
        error = -ENOTEMPTY;
        if (new_dentry == trap)
                goto exit5;
+       /***** TOMOYO Linux start. *****/
+       error = pre_vfs_rename(old_dir->d_inode, old_dentry,
+                              new_dir->d_inode, new_dentry);
+       if (error)
+               goto exit5;
+       error = ccs_check_2path_perm(TYPE_RENAME_ACL, old_dentry,
+                                    oldnd.path.mnt, new_dentry,
+                                    newnd.path.mnt);
+       if (error)
+               goto exit5;
+       /***** TOMOYO Linux end. *****/
 
        error = vfs_rename(old_dir->d_inode, old_dentry, oldnd.path.mnt,
                           new_dir->d_inode, new_dentry, newnd.path.mnt);
@@ -2721,6 +2839,10 @@ asmlinkage long sys_renameat(int olddfd,
        int error;
        char * from;
        char * to;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_RENAME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        from = getname(oldname);
        if(IS_ERR(from))
--- linux-2.6.25.20-0.1.orig/fs/namespace.c
+++ linux-2.6.25.20-0.1/fs/namespace.c
@@ -30,6 +30,12 @@
 #include <asm/unistd.h>
 #include "pnode.h"
 #include "internal.h"
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #define HASH_SHIFT ilog2(PAGE_SIZE / sizeof(struct list_head))
 #define HASH_SIZE (1UL << HASH_SHIFT)
@@ -591,6 +597,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:
@@ -682,6 +693,10 @@ asmlinkage long sys_umount(char __user *
 {
        struct nameidata nd;
        int retval;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_UMOUNT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        retval = __user_walk(name, LOOKUP_FOLLOW, &nd);
        if (retval)
@@ -991,6 +1006,11 @@ static noinline int do_loopback(struct n
        err = -EINVAL;
        if (IS_MNT_UNBINDABLE(old_nd.path.mnt))
                goto out;
+       /***** SAKURA Linux start. *****/
+       err = -EPERM;
+       if (ccs_may_mount(nd))
+               goto out;
+       /***** SAKURA Linux end. *****/
 
        if (!check_mnt(nd->path.mnt) || !check_mnt(old_nd.path.mnt))
                goto out;
@@ -1085,6 +1105,11 @@ static noinline int do_move_mount(struct
        if (!check_mnt(nd->path.mnt) || !check_mnt(old_nd.path.mnt))
                goto out;
 
+       /***** SAKURA Linux start. *****/
+       err = -EPERM;
+       if (ccs_may_umount(old_nd.path.mnt) || ccs_may_mount(nd))
+               goto out;
+       /***** SAKURA Linux end. *****/
        err = -ENOENT;
        mutex_lock(&nd->path.dentry->d_inode->i_mutex);
        if (IS_DEADDIR(nd->path.dentry->d_inode))
@@ -1189,6 +1214,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)))
@@ -1412,6 +1442,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(TOMOYO_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;
@@ -1680,6 +1721,10 @@ asmlinkage long sys_pivot_root(const cha
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_PIVOT_ROOT))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        lock_kernel();
 
@@ -1696,6 +1741,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_put(&old_nd.path);
                goto out1;
--- linux-2.6.25.20-0.1.orig/fs/open.c
+++ linux-2.6.25.20-0.1/fs/open.c
@@ -27,6 +27,12 @@
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
 #include <linux/falloc.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,12 @@ static long do_sys_truncate(const char _
        if (error)
                goto put_write_and_out;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_1path_perm(TYPE_TRUNCATE_ACL, nd.path.dentry,
+                                    nd.path.mnt);
+       if (error)
+               goto put_write_and_out;
+       /***** TOMOYO Linux end. *****/
        error = locks_verify_truncate(inode, NULL, length);
        if (!error) {
                DQUOT_INIT(inode);
@@ -321,6 +333,11 @@ static long do_sys_ftruncate(unsigned in
        if (IS_APPEND(inode))
                goto out_putf;
 
+       /***** TOMOYO Linux start. *****/
+       error = ccs_check_1path_perm(TYPE_TRUNCATE_ACL, dentry, file->f_vfsmnt);
+       if (error)
+               goto out_putf;
+       /***** TOMOYO Linux end. *****/
        error = locks_verify_truncate(inode, file, length);
        if (!error)
                error = do_truncate(dentry, file->f_path.mnt, length,
@@ -539,6 +556,14 @@ asmlinkage long sys_chroot(const char __
        error = -EPERM;
        if (!capable(CAP_SYS_CHROOT))
                goto dput_and_out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_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.path);
        set_fs_altroot();
@@ -1172,6 +1197,10 @@ EXPORT_SYMBOL(sys_close);
  */
 asmlinkage long sys_vhangup(void)
 {
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_VHANGUP))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        if (capable(CAP_SYS_TTY_CONFIG)) {
                /* XXX: this needs locking */
                tty_vhangup(current->signal->tty);
--- linux-2.6.25.20-0.1.orig/fs/proc/Makefile
+++ linux-2.6.25.20-0.1/fs/proc/Makefile
@@ -16,3 +16,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o
 proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
 proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
 proc-$(CONFIG_PRINTK)  += kmsg.o
+
+proc-$(CONFIG_SAKURA) += ccs_proc.o
+proc-$(CONFIG_TOMOYO) += ccs_proc.o
--- linux-2.6.25.20-0.1.orig/fs/proc/proc_misc.c
+++ linux-2.6.25.20-0.1/fs/proc/proc_misc.c
@@ -1021,4 +1021,9 @@ void __init proc_misc_init(void)
                        entry->proc_fops = &proc_sysrq_trigger_operations;
        }
 #endif
+       /***** CCS start. *****/
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
+       printk(KERN_INFO "Hook version: 2.6.25.20-0.1 2009/1/25\n");
+#endif
+       /***** CCS end. *****/
 }
--- linux-2.6.25.20-0.1.orig/include/linux/init_task.h
+++ linux-2.6.25.20-0.1/include/linux/init_task.h
@@ -196,6 +196,10 @@ extern struct group_info init_groups;
        INIT_IDS                                                        \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+       /***** TOMOYO Linux start. *****/        \
+       .domain_info = &KERNEL_DOMAIN,           \
+       .tomoyo_flags = 0,                       \
+       /***** TOMOYO Linux end. *****/          \
 }
 
 
--- linux-2.6.25.20-0.1.orig/include/linux/sched.h
+++ linux-2.6.25.20-0.1/include/linux/sched.h
@@ -29,6 +29,11 @@
 #define CLONE_NEWNET           0x40000000      /* New network namespace */
 #define CLONE_IO               0x80000000      /* Clone io context */
 
+/***** TOMOYO Linux start. *****/
+struct domain_info;
+extern struct domain_info KERNEL_DOMAIN;
+/***** TOMOYO Linux end. *****/
+
 /*
  * Scheduling policies
  */
@@ -1274,6 +1279,10 @@ struct task_struct {
 #ifndef __GENKSYMS__
        struct list_head        *scm_work_list;
 #endif
+       /***** TOMOYO Linux start. *****/
+       struct domain_info *domain_info;
+       u32 tomoyo_flags;
+       /***** TOMOYO Linux end. *****/
 };
 
 /*
--- linux-2.6.25.20-0.1.orig/kernel/compat.c
+++ linux-2.6.25.20-0.1/kernel/compat.c
@@ -25,6 +25,9 @@
 #include <linux/posix-timers.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)
 {
@@ -869,6 +872,10 @@ asmlinkage long compat_sys_stime(compat_
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        do_settimeofday(&tv);
        return 0;
--- linux-2.6.25.20-0.1.orig/kernel/kexec.c
+++ linux-2.6.25.20-0.1/kernel/kexec.c
@@ -31,6 +31,9 @@
 #include <asm/system.h>
 #include <asm/semaphore.h>
 #include <asm/sections.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;
@@ -969,6 +972,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(TOMOYO_SYS_KEXEC_LOAD))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /*
         * Verify we have a legal set of flags
--- linux-2.6.25.20-0.1.orig/kernel/kmod.c
+++ linux-2.6.25.20-0.1/kernel/kmod.c
@@ -173,6 +173,11 @@ static int ____call_usermodehelper(void 
         */
        set_user_nice(current, 0);
 
+       /***** TOMOYO Linux start. *****/
+       current->domain_info = &KERNEL_DOMAIN;
+       current->tomoyo_flags = 0;
+       /***** TOMOYO Linux end. *****/
+
        retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
 
        /* Exec failed? */
--- linux-2.6.25.20-0.1.orig/kernel/module.c
+++ linux-2.6.25.20-0.1/kernel/module.c
@@ -47,6 +47,9 @@
 #include <asm/cacheflush.h>
 #include <linux/license.h>
 #include <asm/sections.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #if 0
 #define DEBUGP printk
@@ -700,6 +703,10 @@ sys_delete_module(const char __user *nam
 
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_USE_KERNEL_MODULE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
                return -EFAULT;
@@ -2181,6 +2188,10 @@ sys_init_module(void __user *umod,
        /* Must have permission */
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_USE_KERNEL_MODULE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /* Only one module load at a time, please */
        if (mutex_lock_interruptible(&module_mutex) != 0)
--- linux-2.6.25.20-0.1.orig/kernel/ptrace.c
+++ linux-2.6.25.20-0.1/kernel/ptrace.c
@@ -24,6 +24,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
@@ -548,6 +551,12 @@ asmlinkage long sys_ptrace(long request,
        /*
         * This lock_kernel fixes a subtle race with suid exec
         */
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
@@ -655,6 +664,12 @@ asmlinkage long compat_sys_ptrace(compat
        /*
         * This lock_kernel fixes a subtle race with suid exec
         */
+       /***** TOMOYO Linux start. *****/
+#ifdef TOMOYO_SYS_PTRACE
+       if (!ccs_capable(TOMOYO_SYS_PTRACE))
+               return -EPERM;
+#endif
+       /***** TOMOYO Linux end. *****/
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
--- linux-2.6.25.20-0.1.orig/kernel/sched.c
+++ linux-2.6.25.20-0.1/kernel/sched.c
@@ -69,6 +69,9 @@
 
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * Scheduler clock - returns current time in nanosec units.
@@ -4510,6 +4513,10 @@ int can_nice(const struct task_struct *p
 asmlinkage long sys_nice(int increment)
 {
        long nice, retval;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_NICE))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /*
         * Setpriority might change our priority at the same moment.
--- linux-2.6.25.20-0.1.orig/kernel/signal.c
+++ linux-2.6.25.20-0.1/kernel/signal.c
@@ -32,6 +32,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.
@@ -2232,6 +2235,12 @@ asmlinkage long
 sys_kill(int pid, int sig)
 {
        struct siginfo info;
+       /***** TOMOYO Linux start. *****/
+       if (sig && !ccs_capable(TOMOYO_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;
@@ -2290,6 +2299,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(TOMOYO_SYS_KILL))
+               return -EPERM;
+       if (sig && ccs_check_signal_acl(sig, pid))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        return do_tkill(tgid, pid, sig);
 }
@@ -2303,6 +2318,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(TOMOYO_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.25.20-0.1.orig/kernel/sys.c
+++ linux-2.6.25.20-0.1/kernel/sys.c
@@ -42,6 +42,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)
@@ -140,6 +143,12 @@ asmlinkage long sys_setpriority(int whic
 
        if (which > PRIO_USER || which < PRIO_PROCESS)
                goto out;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_NICE)) {
+               error = -EPERM;
+               goto out;
+       }
+       /***** TOMOYO Linux end. *****/
 
        /* normalize: avoid signed division (rounding problems) */
        error = -ESRCH;
@@ -376,6 +385,10 @@ asmlinkage long sys_reboot(int magic1, i
                        magic2 != LINUX_REBOOT_MAGIC2B &&
                        magic2 != LINUX_REBOOT_MAGIC2C))
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_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.
@@ -1347,6 +1360,10 @@ asmlinkage long sys_sethostname(char __u
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SETHOSTNAME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
        down_write(&uts_sem);
        errno = -EFAULT;
        if (!copy_from_user(tmp, name, len)) {
@@ -1392,6 +1409,10 @@ asmlinkage long sys_setdomainname(char _
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SETHOSTNAME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        down_write(&uts_sem);
        errno = -EFAULT;
--- linux-2.6.25.20-0.1.orig/kernel/sysctl.c
+++ linux-2.6.25.20-0.1/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. *****/
 
 #ifdef CONFIG_X86
 #include <asm/nmi.h>
@@ -1500,6 +1503,93 @@ char *sysctl_pathname(struct ctl_table *
 EXPORT_SYMBOL_GPL(sysctl_pathname);
 
 #ifdef CONFIG_SYSCTL_SYSCALL
+
+/***** TOMOYO Linux start. *****/
+static int try_parse_table(int __user *name, int nlen, void __user *oldval,
+                          void __user *newval, ctl_table *table)
+{
+       int n;
+       int error = -ENOMEM;
+       int op = 0;
+       char *buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
+       if (oldval)
+               op |= 004;
+       if (newval)
+               op |= 002;
+       if (!op) { /* Neither read nor write */
+               error = 0;
+               goto out;
+       }
+       if (!buffer)
+               goto out;
+       memset(buffer, 0, PAGE_SIZE);
+       snprintf(buffer, PAGE_SIZE - 1, "/proc/sys");
+ repeat:
+       if (!nlen) {
+               error = -ENOTDIR;
+               goto out;
+       }
+       if (get_user(n, name)) {
+               error = -EFAULT;
+               goto out;
+       }
+       for ( ; table->ctl_name || table->procname; table++) {
+               if (n == table->ctl_name && n) {
+                       int pos = strlen(buffer);
+                       const char *cp = table->procname;
+                       error = -ENOMEM;
+                       if (cp) {
+                               if (pos + 1 >= PAGE_SIZE - 1)
+                                       goto out;
+                               buffer[pos++] = '/';
+                               while (*cp) {
+                                       const unsigned char c
+                                               = *(const unsigned char *) cp;
+                                       if (c == '\\') {
+                                               if (pos + 2 >= PAGE_SIZE - 1)
+                                                       goto out;
+                                               buffer[pos++] = '\\';
+                                               buffer[pos++] = '\\';
+                                       } else if (c > ' ' && c < 127) {
+                                               if (pos + 1 >= PAGE_SIZE - 1)
+                                                       goto out;
+                                               buffer[pos++] = c;
+                                       } else {
+                                               if (pos + 4 >= PAGE_SIZE - 1)
+                                                       goto out;
+                                               buffer[pos++] = '\\';
+                                               buffer[pos++] = (c >> 6) + '0';
+                                               buffer[pos++] = ((c >> 3) & 7)
+                                                       + '0';
+                                               buffer[pos++] = (c & 7) + '0';
+                                       }
+                                       cp++;
+                               }
+                       } else {
+                               /* Assume nobody assigns "=\$=" for procname. */
+                               snprintf(buffer + pos, PAGE_SIZE - pos - 1,
+                                        "/=%d=", n);
+                               if (!memchr(buffer, '\0', PAGE_SIZE - 2))
+                                       goto out;
+                       }
+                       if (table->child) {
+                               name++;
+                               nlen--;
+                               table = table->child;
+                               goto repeat;
+                       }
+                       /* printk("sysctl='%s'\n", buffer); */
+                       error = ccs_check_file_perm(buffer, op, "sysctl");
+                       goto out;
+               }
+       }
+       error = -ENOTDIR;
+ out:
+       kfree(buffer);
+       return error;
+}
+/***** TOMOYO Linux end. *****/
+
 int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp,
               void __user *newval, size_t newlen)
 {
@@ -1516,6 +1606,11 @@ int do_sysctl(int __user *name, int nlen
 
        for (head = sysctl_head_next(NULL); head;
                        head = sysctl_head_next(head)) {
+               /***** TOMOYO Linux start. *****/
+               error = try_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);
                if (error != -ENOTDIR) {
--- linux-2.6.25.20-0.1.orig/kernel/time.c
+++ linux-2.6.25.20-0.1/kernel/time.c
@@ -38,6 +38,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 #include "timeconst.h"
 
@@ -88,6 +91,10 @@ asmlinkage long sys_stime(time_t __user 
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        do_settimeofday(&tv);
        return 0;
@@ -159,6 +166,10 @@ int do_sys_settimeofday(struct timespec 
        error = security_settime(tv, tz);
        if (error)
                return error;
+       /***** TOMOYO Linux start. *****/
+       if (!ccs_capable(TOMOYO_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        if (tz) {
                /* SMP safe, global irq locking makes it work. */
--- linux-2.6.25.20-0.1.orig/kernel/time/ntp.c
+++ linux-2.6.25.20-0.1/kernel/time/ntp.c
@@ -17,6 +17,9 @@
 #include <linux/capability.h>
 #include <asm/div64.h>
 #include <asm/timex.h>
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+/***** TOMOYO Linux end. *****/
 
 /*
  * Timekeeping variables
@@ -243,6 +246,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(TOMOYO_SYS_SETTIME))
+               return -EPERM;
+       /***** TOMOYO Linux end. *****/
 
        /* Now we validate the data before disabling interrupts */
 
--- linux-2.6.25.20-0.1.orig/net/core/datagram.c
+++ linux-2.6.25.20-0.1/net/core/datagram.c
@@ -56,6 +56,11 @@
 #include <net/sock.h>
 #include <net/tcp_states.h>
 
+/***** TOMOYO Linux start. *****/
+#include <linux/tomoyo.h>
+#include <linux/tomoyo_socket.h>
+/***** TOMOYO Linux end. *****/
+
 /*
  *     Is a socket 'connection oriented' ?
  */
@@ -179,6 +184,12 @@ struct sk_buff *__skb_recv_datagram(stru
                }
                spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags);
 
+               /***** TOMOYO Linux start. *****/
+               error = ccs_socket_recv_datagram_permission(sk, skb, flags);
+               if (error)
+                       goto no_packet;
+               /***** TOMOYO Linux end. *****/
+
                if (skb)
                        return skb;
 
--- linux-2.6.25.20-0.1.orig/net/ipv4/inet_connection_sock.c
+++ linux-2.6.25.20-0.1/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";
@@ -98,6 +101,10 @@ int inet_csk_get_port(struct sock *sk, u
                do {
                        head = &hashinfo->bhash[inet_bhashfn(rover, hashinfo->bhash_size)];
                        spin_lock(&head->lock);
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_may_autobind(rover))
+                               goto next;
+                       /***** SAKURA Linux end. *****/
                        inet_bind_bucket_for_each(tb, node, &head->chain)
                                if (tb->ib_net == net && tb->port == rover)
                                        goto next;
--- linux-2.6.25.20-0.1.orig/net/ipv4/inet_hashtables.c
+++ linux-2.6.25.20-0.1/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.
@@ -421,6 +424,10 @@ int __inet_hash_connect(struct inet_time
                local_bh_disable();
                for (i = 1; i <= remaining; i++) {
                        port = low + (i + offset) % remaining;
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_may_autobind(port))
+                               continue;
+                       /***** SAKURA Linux end. *****/
                        head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
                        spin_lock(&head->lock);
 
--- linux-2.6.25.20-0.1.orig/net/ipv4/udp.c
+++ linux-2.6.25.20-0.1/net/ipv4/udp.c
@@ -105,6 +105,9 @@
 #include <net/checksum.h>
 #include <net/xfrm.h>
 #include "udp_impl.h"
+/***** SAKURA Linux start. *****/
+#include <linux/sakura.h>
+/***** SAKURA Linux end. *****/
 
 /*
  *     Snmp MIB for the UDP layer
@@ -176,6 +179,10 @@ int __udp_lib_get_port(struct sock *sk, 
                /* 1st pass: look for empty (or shortest) hash chain */
                for (i = 0; i < UDP_HTABLE_SIZE; i++) {
                        int size = 0;
+                       /***** SAKURA Linux start. *****/
+                       if (ccs_may_autobind(rover))
+                               goto next;
+                       /***** SAKURA Linux end. *****/
 
                        head = &udptable[rover & (UDP_HTABLE_SIZE - 1)];
                        if (hlist_empty(head))
@@ -199,6 +206,9 @@ int __udp_lib_get_port(struct sock *sk, 
                /* 2nd pass: find hole in shortest hash chain */
                rover = best;
                for (i = 0; i < (1 << 16) / UDP_HTABLE_SIZE; i++) {
+                       /***** SAKURA Linux start. *****/
+                       if (!ccs_may_autobind(rover))
+                       /***** SAKURA Linux end. *****/
                        if (! __udp_lib_lport_inuse(net, rover, udptable))
                                goto gotit;
                        rover += UDP_HTABLE_SIZE;
--- linux-2.6.25.20-0.1.orig/net/socket.c
+++ linux-2.6.25.20-0.1/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, const struct iovec *iov,
                         unsigned long nr_segs, loff_t pos);
@@ -557,6 +562,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);
 }
@@ -1120,6 +1131,12 @@ static int __sock_create(struct net *net
                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;
@@ -1351,6 +1368,13 @@ asmlinkage long sys_bind(int fd, struct 
                        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 *)
@@ -1380,6 +1404,10 @@ asmlinkage long sys_listen(int fd, int b
                        backlog = 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);
 
@@ -1444,6 +1472,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) {
@@ -1508,6 +1543,12 @@ asmlinkage long sys_connect(int fd, stru
            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);
--- linux-2.6.25.20-0.1.orig/net/unix/af_unix.c
+++ linux-2.6.25.20-0.1/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. *****/
 
 static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
 static DEFINE_SPINLOCK(unix_table_lock);
@@ -776,6 +779,11 @@ static int unix_bind(struct socket *sock
                err = unix_autobind(sock);
                goto out;
        }
+       /***** TOMOYO Linux start. *****/
+       err = -EPERM;
+       if (sunaddr->sun_path[0] && !ccs_capable(TOMOYO_CREATE_UNIX_SOCKET))
+               goto out;
+       /***** TOMOYO Linux end. *****/
 
        err = unix_mkname(sunaddr, addr_len, &hash);
        if (err < 0)
@@ -819,6 +827,13 @@ static int unix_bind(struct socket *sock
                 */
                mode = S_IFSOCK |
                       (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
+               /***** TOMOYO Linux start. *****/
+               err = pre_vfs_mknod(nd.path.dentry->d_inode, dentry, mode);
+               if (!err)
+                       err = ccs_check_1path_perm(TYPE_MKSOCK_ACL, dentry,
+                                                  nd.path.mnt);
+               if (!err)
+               /***** TOMOYO Linux end. *****/
                err = vfs_mknod(nd.path.dentry->d_inode, dentry, nd.path.mnt,
                                mode, 0);
                if (err)