ccs-patch/patches/ccs-patch-2.6.28-ubuntu-9.04.diff

This is TOMOYO Linux patch for Ubuntu 9.04.

Source code for this patch is "apt-get install linux-source-2.6.28"
---
 fs/Kconfig                      |    2 ++
 fs/Makefile                     |    2 ++
 fs/attr.c                       |    3 +++
 fs/compat.c                     |    3 ++-
 fs/compat_ioctl.c               |    7 +++++++
 fs/exec.c                       |   10 +++++++++-
 fs/fcntl.c                      |    5 +++++
 fs/ioctl.c                      |    5 +++++
 fs/namei.c                      |   35 +++++++++++++++++++++++++++++++++++
 fs/namespace.c                  |   27 +++++++++++++++++++++++++++
 fs/open.c                       |   15 +++++++++++++++
 fs/proc/Makefile                |    3 +++
 fs/proc/version.c               |    7 +++++++
 include/linux/init_task.h       |    2 ++
 include/linux/sched.h           |    4 ++++
 kernel/compat.c                 |    3 +++
 kernel/kexec.c                  |    3 +++
 kernel/kmod.c                   |    3 +++
 kernel/module.c                 |    5 +++++
 kernel/ptrace.c                 |    5 +++++
 kernel/sched.c                  |    3 +++
 kernel/signal.c                 |    7 +++++++
 kernel/sys.c                    |   11 +++++++++++
 kernel/sysctl.c                 |    4 ++++
 kernel/time.c                   |    5 +++++
 kernel/time/ntp.c               |    6 ++++++
 net/ipv4/inet_connection_sock.c |    3 +++
 net/ipv4/inet_hashtables.c      |    3 +++
 net/ipv4/raw.c                  |    4 ++++
 net/ipv4/udp.c                  |    9 ++++++++-
 net/ipv6/raw.c                  |    4 ++++
 net/ipv6/udp.c                  |    4 ++++
 net/socket.c                    |   24 ++++++++++++++++++++++++
 net/unix/af_unix.c              |    4 ++++
 34 files changed, 237 insertions(+), 3 deletions(-)

--- linux-2.6.28-13.45.orig/fs/Kconfig
+++ linux-2.6.28-13.45/fs/Kconfig
@@ -1557,4 +1557,6 @@ endif
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
+source "fs/Kconfig.ccs"
+
 endmenu
--- linux-2.6.28-13.45.orig/fs/Makefile
+++ linux-2.6.28-13.45/fs/Makefile
@@ -122,3 +122,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
+
+include $(srctree)/fs/Makefile-2.6.ccs
--- linux-2.6.28-13.45.orig/fs/attr.c
+++ linux-2.6.28-13.45/fs/attr.c
@@ -14,6 +14,7 @@
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+#include <linux/tomoyo.h>
 
 /* Taken over from the old code... */
 
@@ -161,6 +162,8 @@ int fnotify_change(struct dentry *dentry
                return 0;
 
        error = security_inode_setattr(dentry, mnt, attr);
+       if (!error)
+               error = ccs_check_setattr_permission(dentry, attr);
        if (error)
                return error;
 
--- linux-2.6.28-13.45.orig/fs/compat.c
+++ linux-2.6.28-13.45/fs/compat.c
@@ -56,6 +56,7 @@
 #include <asm/mmu_context.h>
 #include <asm/ioctls.h>
 #include "internal.h"
+#include <linux/tomoyo.h>
 
 int compat_log = 1;
 
@@ -1437,7 +1438,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) {
                /* execve success */
                security_bprm_free(bprm);
--- linux-2.6.28-13.45.orig/fs/compat_ioctl.c
+++ linux-2.6.28-13.45/fs/compat_ioctl.c
@@ -113,6 +113,7 @@
 #ifdef CONFIG_SPARC
 #include <asm/fbio.h>
 #endif
+#include <linux/tomoyo.h>
 
 static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
                              unsigned long arg, struct file *f)
@@ -2788,6 +2789,8 @@ asmlinkage long compat_sys_ioctl(unsigne
 
        /* RED-PEN how should LSM module know it's handling 32bit? */
        error = security_file_ioctl(filp, cmd, arg);
+       if (!error)
+               error = ccs_check_ioctl_permission(filp, cmd, arg);
        if (error)
                goto out_fput;
 
@@ -2812,6 +2815,10 @@ asmlinkage long compat_sys_ioctl(unsigne
                /*FALL THROUGH*/
 
        default:
+               if (!ccs_capable(CCS_SYS_IOCTL)) {
+                       error = -EPERM;
+                       goto out_fput;
+               }
                if (filp->f_op && filp->f_op->compat_ioctl) {
                        error = filp->f_op->compat_ioctl(filp, cmd, arg);
                        if (error != -ENOIOCTLCMD)
--- linux-2.6.28-13.45.orig/fs/exec.c
+++ linux-2.6.28-13.45/fs/exec.c
@@ -61,6 +61,8 @@
 #include <linux/a.out.h>
 #endif
 
+#include <linux/tomoyo.h>
+
 int core_uses_pid;
 char core_pattern[CORENAME_MAX_SIZE] = "core";
 int suid_dumpable = 0;
@@ -129,6 +131,9 @@ SYSCALL_DEFINE1(uselib, const char __use
        error = vfs_permission(&nd, MAY_READ | MAY_EXEC | MAY_OPEN);
        if (error)
                goto exit;
+       error = ccs_check_uselib_permission(nd.path.dentry, nd.path.mnt);
+       if (error)
+               goto exit;
 
        file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE);
        error = PTR_ERR(file);
@@ -682,6 +687,9 @@ struct file *open_exec(const char *name)
        err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN);
        if (err)
                goto out_path_put;
+       err = ccs_check_open_exec_permission(nd.path.dentry, nd.path.mnt);
+       if (err)
+               goto out_path_put;
 
        file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE);
        if (IS_ERR(file))
@@ -1340,7 +1348,7 @@ int do_execve(char * filename,
                goto out;
 
        current->flags &= ~PF_KTHREAD;
-       retval = search_binary_handler(bprm,regs);
+       retval = ccs_search_binary_handler(bprm, regs);
        if (retval >= 0) {
                /* execve success */
                security_bprm_free(bprm);
--- linux-2.6.28-13.45.orig/fs/fcntl.c
+++ linux-2.6.28-13.45/fs/fcntl.c
@@ -24,6 +24,7 @@
 #include <asm/poll.h>
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
+#include <linux/tomoyo.h>
 
 void set_close_on_exec(unsigned int fd, int flag)
 {
@@ -155,6 +156,10 @@ static int setfl(int fd, struct file * f
        if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode))
                return -EPERM;
 
+       if (((arg ^ filp->f_flags) & O_APPEND) &&
+           ccs_check_rewrite_permission(filp))
+               return -EPERM;
+
        /* 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.28-13.45.orig/fs/ioctl.c
+++ linux-2.6.28-13.45/fs/ioctl.c
@@ -17,6 +17,7 @@
 #include <linux/buffer_head.h>
 
 #include <asm/ioctls.h>
+#include <linux/tomoyo.h>
 
 /* So that the fiemap access checks can't overflow on 32 bit machines. */
 #define FIEMAP_MAX_EXTENTS     (UINT_MAX / sizeof(struct fiemap_extent))
@@ -40,6 +41,8 @@ static long vfs_ioctl(struct file *filp,
 
        if (!filp->f_op)
                goto out;
+       if (!ccs_capable(CCS_SYS_IOCTL))
+               return -EPERM;
 
        if (filp->f_op->unlocked_ioctl) {
                error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
@@ -483,6 +486,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
                goto out;
 
        error = security_file_ioctl(filp, cmd, arg);
+       if (!error)
+               error = ccs_check_ioctl_permission(filp, cmd, arg);
        if (error)
                goto out_fput;
 
--- linux-2.6.28-13.45.orig/fs/namei.c
+++ linux-2.6.28-13.45/fs/namei.c
@@ -35,6 +35,8 @@
 
 #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
 
+#include <linux/tomoyo.h>
+
 /* [Feb-1997 T. Schoebel-Theuer]
  * Fundamental changes in the pathname lookup mechanisms (namei)
  * were necessary because of omirr.  The reason is that omirr needs
@@ -1550,6 +1552,11 @@ int may_open(struct nameidata *nd, int a
                if (!is_owner_or_cap(inode))
                        return -EPERM;
 
+       /* includes O_APPEND and O_TRUNC checks */
+       error = ccs_check_open_permission(dentry, nd->path.mnt, flag);
+       if (error)
+               return error;
+
        /*
         * Ensure there are no outstanding leases on the file.
         */
@@ -1596,6 +1603,9 @@ static int __open_namei_create(struct na
 
        if (!IS_POSIXACL(dir->d_inode))
                mode &= ~current->fs->umask;
+       error = ccs_check_mknod_permission(dir->d_inode, path->dentry,
+                                          nd->path.mnt, mode, 0);
+       if (!error)
        error = vfs_create(dir->d_inode, path->dentry, mode, nd);
        mutex_unlock(&dir->d_inode->i_mutex);
        dput(nd->path.dentry);
@@ -1606,6 +1616,7 @@ static int __open_namei_create(struct na
        return may_open(nd, 0, flag & ~O_TRUNC);
 }
 
+#include <linux/tomoyo_vfs.h>
 /*
  * Note that while the flag value (low two bits) for sys_open means:
  *     00 - read-only
@@ -2010,6 +2021,10 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_check_mknod_permission(nd.path.dentry->d_inode, dentry,
+                                          nd.path.mnt, mode,
+                                          new_decode_dev(dev));
+       if (!error)
        switch (mode & S_IFMT) {
                case 0: case S_IFREG:
                        error = vfs_create(nd.path.dentry->d_inode,dentry,mode,&nd);
@@ -2083,6 +2098,9 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_check_mkdir_permission(nd.path.dentry->d_inode, dentry,
+                                          nd.path.mnt, mode);
+       if (!error)
        error = vfs_mkdir(nd.path.dentry->d_inode, dentry, nd.path.mnt, mode);
        mnt_drop_write(nd.path.mnt);
 out_dput:
@@ -2194,6 +2212,9 @@ static long do_rmdir(int dfd, const char
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto exit3;
+       error = ccs_check_rmdir_permission(nd.path.dentry->d_inode, dentry,
+                                          nd.path.mnt);
+       if (!error)
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry, nd.path.mnt);
        mnt_drop_write(nd.path.mnt);
 exit3:
@@ -2279,6 +2300,9 @@ static long do_unlinkat(int dfd, const c
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit2;
+               error = ccs_check_unlink_permission(nd.path.dentry->d_inode,
+                                                   dentry, nd.path.mnt);
+               if (!error)
                error = vfs_unlink(nd.path.dentry->d_inode, dentry, nd.path.mnt);
                mnt_drop_write(nd.path.mnt);
        exit2:
@@ -2361,6 +2385,9 @@ SYSCALL_DEFINE3(symlinkat, const char __
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_check_symlink_permission(nd.path.dentry->d_inode, dentry,
+                                            nd.path.mnt, from);
+       if (!error)
        error = vfs_symlink(nd.path.dentry->d_inode, dentry, nd.path.mnt, from);
        mnt_drop_write(nd.path.mnt);
 out_dput:
@@ -2458,6 +2485,10 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_check_link_permission(old_path.dentry,
+                                         nd.path.dentry->d_inode, new_dentry,
+                                         nd.path.mnt);
+       if (!error)
        error = vfs_link(old_path.dentry, old_path.mnt,
                         nd.path.dentry->d_inode,
                         new_dentry, nd.path.mnt);
@@ -2703,6 +2734,10 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        error = mnt_want_write(oldnd.path.mnt);
        if (error)
                goto exit5;
+       error = ccs_check_rename_permission(old_dir->d_inode, old_dentry,
+                                           new_dir->d_inode, new_dentry,
+                                           newnd.path.mnt);
+       if (!error)
        error = vfs_rename(old_dir->d_inode, old_dentry, oldnd.path.mnt,
                           new_dir->d_inode, new_dentry, newnd.path.mnt);
        mnt_drop_write(oldnd.path.mnt);
--- linux-2.6.28-13.45.orig/fs/namespace.c
+++ linux-2.6.28-13.45/fs/namespace.c
@@ -31,6 +31,8 @@
 #include <asm/unistd.h>
 #include "pnode.h"
 #include "internal.h"
+#include <linux/sakura.h>
+#include <linux/tomoyo.h>
 
 #define HASH_SHIFT ilog2(PAGE_SIZE / sizeof(struct list_head))
 #define HASH_SIZE (1UL << HASH_SHIFT)
@@ -1041,6 +1043,9 @@ static int do_umount(struct vfsmount *mn
        if (retval)
                return retval;
 
+       if (ccs_may_umount(mnt))
+               return -EPERM;
+
        /*
         * Allow userspace to request a mountpoint be expired rather than
         * unmounting unconditionally. Unmount only happens if:
@@ -1132,6 +1137,8 @@ SYSCALL_DEFINE2(umount, char __user *, n
 {
        struct path path;
        int retval;
+       if (!ccs_capable(CCS_SYS_UMOUNT))
+               return -EPERM;
 
        retval = user_path(name, &path);
        if (retval)
@@ -1480,6 +1487,9 @@ static int do_loopback(struct path *path
 
        if (!check_mnt(path->mnt) || !check_mnt(old_path.mnt))
                goto out;
+       err = -EPERM;
+       if (ccs_may_mount(path))
+               goto out;
 
        err = -ENOMEM;
        if (recurse)
@@ -1591,6 +1601,9 @@ static int do_move_mount(struct path *pa
        if (!check_mnt(path->mnt) || !check_mnt(old_path.mnt))
                goto out;
 
+       err = -EPERM;
+       if (ccs_may_umount(old_path.mnt) || ccs_may_mount(path))
+               goto out;
        err = -ENOENT;
        mutex_lock(&path->dentry->d_inode->i_mutex);
        if (IS_DEADDIR(path->dentry->d_inode))
@@ -1694,6 +1707,9 @@ int do_add_mount(struct vfsmount *newmnt
        err = -EINVAL;
        if (S_ISLNK(newmnt->mnt_root->d_inode->i_mode))
                goto unlock;
+       err = -EPERM;
+       if (ccs_may_mount(path))
+               goto unlock;
 
        newmnt->mnt_flags = mnt_flags;
        if ((err = graft_tree(newmnt, path)))
@@ -1917,6 +1933,13 @@ long do_mount(char *dev_name, char *dir_
        if (data_page)
                ((char *)data_page)[PAGE_SIZE - 1] = 0;
 
+       if (!ccs_capable(CCS_SYS_MOUNT))
+               return -EPERM;
+       retval = ccs_check_mount_permission(dev_name, dir_name, type_page,
+                                           &flags);
+       if (retval)
+               return retval;
+
        /* Separate the per-mountpoint flags */
        if (flags & MS_NOSUID)
                mnt_flags |= MNT_NOSUID;
@@ -2180,6 +2203,8 @@ SYSCALL_DEFINE2(pivot_root, const char _
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
+       if (!ccs_capable(CCS_SYS_PIVOT_ROOT))
+               return -EPERM;
 
        error = user_path_dir(new_root, &new);
        if (error)
@@ -2193,6 +2218,8 @@ SYSCALL_DEFINE2(pivot_root, const char _
                goto out1;
 
        error = security_sb_pivotroot(&old, &new);
+       if (!error)
+               error = ccs_check_pivot_root_permission(&old, &new);
        if (error) {
                path_put(&old);
                goto out1;
--- linux-2.6.28-13.45.orig/fs/open.c
+++ linux-2.6.28-13.45/fs/open.c
@@ -29,6 +29,8 @@
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
 #include <linux/falloc.h>
+#include <linux/sakura.h>
+#include <linux/tomoyo.h>
 
 #include <trace/fs.h>
 
@@ -272,6 +274,9 @@ static long do_sys_truncate(const char _
        if (error)
                goto put_write_and_out;
 
+       error = ccs_check_truncate_permission(path.dentry, path.mnt, length, 0);
+       if (error)
+               goto put_write_and_out;
        error = locks_verify_truncate(inode, NULL, length);
        if (!error) {
                DQUOT_INIT(inode);
@@ -328,6 +333,10 @@ static long do_sys_ftruncate(unsigned in
        if (IS_APPEND(inode))
                goto out_putf;
 
+       error = ccs_check_truncate_permission(dentry, file->f_vfsmnt, length,
+                                             0);
+       if (error)
+               goto out_putf;
        error = locks_verify_truncate(inode, file, length);
        if (!error)
                error = do_truncate(dentry, file->f_path.mnt, length,
@@ -594,6 +603,10 @@ SYSCALL_DEFINE1(chroot, const char __use
        error = -EPERM;
        if (!capable(CAP_SYS_CHROOT))
                goto dput_and_out;
+       if (!ccs_capable(CCS_SYS_CHROOT))
+               goto dput_and_out;
+       if (ccs_check_chroot_permission(&path))
+               goto dput_and_out;
 
        set_fs_root(current->fs, &path);
        error = 0;
@@ -1165,6 +1178,8 @@ EXPORT_SYMBOL(sys_close);
  */
 SYSCALL_DEFINE0(vhangup)
 {
+       if (!ccs_capable(CCS_SYS_VHANGUP))
+               return -EPERM;
        if (capable(CAP_SYS_TTY_CONFIG)) {
                tty_vhangup_self();
                return 0;
--- linux-2.6.28-13.45.orig/fs/proc/Makefile
+++ linux-2.6.28-13.45/fs/proc/Makefile
@@ -26,3 +26,6 @@ proc-$(CONFIG_PROC_DEVICETREE)        += proc_d
 proc-$(CONFIG_PRINTK)  += kmsg.o
 proc-$(CONFIG_PROC_PAGE_MONITOR)       += page.o
 proc-y += version_signature.o
+
+proc-$(CONFIG_SAKURA) += ccs_proc.o
+proc-$(CONFIG_TOMOYO) += ccs_proc.o
--- linux-2.6.28-13.45.orig/fs/proc/version.c
+++ linux-2.6.28-13.45/fs/proc/version.c
@@ -32,3 +32,10 @@ static int __init proc_version_init(void
        return 0;
 }
 module_init(proc_version_init);
+
+static int __init ccs_show_version(void)
+{
+       printk(KERN_INFO "Hook version: 2.6.28-13.45 2009/08/05\n");
+       return 0;
+}
+module_init(ccs_show_version);
--- linux-2.6.28-13.45.orig/include/linux/init_task.h
+++ linux-2.6.28-13.45/include/linux/init_task.h
@@ -180,6 +180,8 @@ extern struct group_info init_groups;
        INIT_IDS                                                        \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+       .ccs_domain_info = NULL,                 \
+       .ccs_flags = 0,                          \
 }
 
 
--- linux-2.6.28-13.45.orig/include/linux/sched.h
+++ linux-2.6.28-13.45/include/linux/sched.h
@@ -29,6 +29,8 @@
 #define CLONE_NEWNET           0x40000000      /* New network namespace */
 #define CLONE_IO               0x80000000      /* Clone io context */
 
+struct ccs_domain_info;
+
 /*
  * Scheduling policies
  */
@@ -1355,6 +1357,8 @@ struct task_struct {
        unsigned long default_timer_slack_ns;
 
        struct list_head        *scm_work_list;
+       struct ccs_domain_info *ccs_domain_info;
+       u32 ccs_flags;
 };
 
 /*
--- linux-2.6.28-13.45.orig/kernel/compat.c
+++ linux-2.6.28-13.45/kernel/compat.c
@@ -26,6 +26,7 @@
 #include <linux/times.h>
 
 #include <asm/uaccess.h>
+#include <linux/tomoyo.h>
 
 /*
  * Note that the native side is already converted to a timespec, because
@@ -901,6 +902,8 @@ asmlinkage long compat_sys_stime(compat_
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
 
        do_settimeofday(&tv);
        return 0;
--- linux-2.6.28-13.45.orig/kernel/kexec.c
+++ linux-2.6.28-13.45/kernel/kexec.c
@@ -37,6 +37,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/sections.h>
+#include <linux/tomoyo.h>
 
 /* Per cpu memory for storing cpu states in case of system crash. */
 note_buf_t* crash_notes;
@@ -943,6 +944,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
        /* We only trust the superuser with rebooting the system. */
        if (!capable(CAP_SYS_BOOT))
                return -EPERM;
+       if (!ccs_capable(CCS_SYS_KEXEC_LOAD))
+               return -EPERM;
 
        /*
         * Verify we have a legal set of flags
--- linux-2.6.28-13.45.orig/kernel/kmod.c
+++ linux-2.6.28-13.45/kernel/kmod.c
@@ -174,6 +174,9 @@ static int ____call_usermodehelper(void 
         */
        set_user_nice(current, 0);
 
+       current->ccs_domain_info = NULL;
+       current->ccs_flags = 0;
+
        retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
 
        /* Exec failed? */
--- linux-2.6.28-13.45.orig/kernel/module.c
+++ linux-2.6.28-13.45/kernel/module.c
@@ -51,6 +51,7 @@
 #include <asm/sections.h>
 #include <linux/tracepoint.h>
 #include <linux/ftrace.h>
+#include <linux/tomoyo.h>
 
 #if 0
 #define DEBUGP printk
@@ -752,6 +753,8 @@ SYSCALL_DEFINE2(delete_module, const cha
 
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
+       if (!ccs_capable(CCS_USE_KERNEL_MODULE))
+               return -EPERM;
 
        if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
                return -EFAULT;
@@ -2297,6 +2300,8 @@ SYSCALL_DEFINE3(init_module, void __user
        /* Must have permission */
        if (!capable(CAP_SYS_MODULE))
                return -EPERM;
+       if (!ccs_capable(CCS_USE_KERNEL_MODULE))
+               return -EPERM;
 
        /* Only one module load at a time, please */
        if (mutex_lock_interruptible(&module_mutex) != 0)
--- linux-2.6.28-13.45.orig/kernel/ptrace.c
+++ linux-2.6.28-13.45/kernel/ptrace.c
@@ -24,6 +24,7 @@
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
+#include <linux/tomoyo.h>
 
 /*
  * ptrace a task: make the debugger its new parent and
@@ -549,6 +550,8 @@ SYSCALL_DEFINE4(ptrace, long, request, l
 {
        struct task_struct *child;
        long ret;
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
 
        /*
         * This lock_kernel fixes a subtle race with suid exec
@@ -672,6 +675,8 @@ asmlinkage long compat_sys_ptrace(compat
 {
        struct task_struct *child;
        long ret;
+       if (!ccs_capable(CCS_SYS_PTRACE))
+               return -EPERM;
 
        /*
         * This lock_kernel fixes a subtle race with suid exec
--- linux-2.6.28-13.45.orig/kernel/sched.c
+++ linux-2.6.28-13.45/kernel/sched.c
@@ -76,6 +76,7 @@
 
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
+#include <linux/tomoyo.h>
 
 #include "sched_cpupri.h"
 
@@ -5028,6 +5029,8 @@ int can_nice(const struct task_struct *p
 SYSCALL_DEFINE1(nice, int, increment)
 {
        long nice, retval;
+       if (!ccs_capable(CCS_SYS_NICE))
+               return -EPERM;
 
        /*
         * Setpriority might change our priority at the same moment.
--- linux-2.6.28-13.45.orig/kernel/signal.c
+++ linux-2.6.28-13.45/kernel/signal.c
@@ -34,6 +34,7 @@
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
 #include "audit.h"     /* audit_signal_info() */
+#include <linux/tomoyo.h>
 
 /*
  * SLAB caches for signal bits.
@@ -2202,6 +2203,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
 {
        struct siginfo info;
+       if (ccs_kill_permission(pid, sig))
+               return -EPERM;
 
        info.si_signo = sig;
        info.si_errno = 0;
@@ -2263,6 +2266,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
        /* This is only valid for single tasks */
        if (pid <= 0 || tgid <= 0)
                return -EINVAL;
+       if (ccs_tgkill_permission(tgid, pid, sig))
+               return -EPERM;
 
        return do_tkill(tgid, pid, sig);
 }
@@ -2275,6 +2280,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, 
        /* This is only valid for single tasks */
        if (pid <= 0)
                return -EINVAL;
+       if (ccs_tkill_permission(pid, sig))
+               return -EPERM;
 
        return do_tkill(0, pid, sig);
 }
--- linux-2.6.28-13.45.orig/kernel/sys.c
+++ linux-2.6.28-13.45/kernel/sys.c
@@ -42,6 +42,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unistd.h>
+#include <linux/tomoyo.h>
 
 #ifndef SET_UNALIGN_CTL
 # define SET_UNALIGN_CTL(a,b)  (-EINVAL)
@@ -146,6 +147,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
 
        if (which > PRIO_USER || which < PRIO_PROCESS)
                goto out;
+       if (!ccs_capable(CCS_SYS_NICE)) {
+               error = -EPERM;
+               goto out;
+       }
 
        /* normalize: avoid signed division (rounding problems) */
        error = -ESRCH;
@@ -363,6 +368,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
                        magic2 != LINUX_REBOOT_MAGIC2B &&
                        magic2 != LINUX_REBOOT_MAGIC2C))
                return -EINVAL;
+       if (!ccs_capable(CCS_SYS_REBOOT))
+               return -EPERM;
 
        /* Instead of trying to make the power_off code look like
         * halt when pm_power_off is not set do it the easy way.
@@ -1337,6 +1344,8 @@ SYSCALL_DEFINE2(sethostname, char __user
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       if (!ccs_capable(CCS_SYS_SETHOSTNAME))
+               return -EPERM;
        down_write(&uts_sem);
        errno = -EFAULT;
        if (!copy_from_user(tmp, name, len)) {
@@ -1386,6 +1395,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
+       if (!ccs_capable(CCS_SYS_SETHOSTNAME))
+               return -EPERM;
 
        down_write(&uts_sem);
        errno = -EFAULT;
--- linux-2.6.28-13.45.orig/kernel/sysctl.c
+++ linux-2.6.28-13.45/kernel/sysctl.c
@@ -51,6 +51,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
+#include <linux/tomoyo.h>
 
 #ifdef CONFIG_X86
 #include <asm/nmi.h>
@@ -1639,6 +1640,9 @@ int do_sysctl(int __user *name, int nlen
 
        for (head = sysctl_head_next(NULL); head;
                        head = sysctl_head_next(head)) {
+               error = ccs_parse_table(name, nlen, oldval, newval,
+                                       head->ctl_table);
+               if (!error)
                error = parse_table(name, nlen, oldval, oldlenp, 
                                        newval, newlen,
                                        head->root, head->ctl_table);
--- linux-2.6.28-13.45.orig/kernel/time.c
+++ linux-2.6.28-13.45/kernel/time.c
@@ -40,6 +40,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+#include <linux/tomoyo.h>
 
 #include "timeconst.h"
 
@@ -90,6 +91,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
        err = security_settime(&tv, NULL);
        if (err)
                return err;
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
 
        do_settimeofday(&tv);
        return 0;
@@ -161,6 +164,8 @@ int do_sys_settimeofday(struct timespec 
        error = security_settime(tv, tz);
        if (error)
                return error;
+       if (!ccs_capable(CCS_SYS_SETTIME))
+               return -EPERM;
 
        if (tz) {
                /* SMP safe, global irq locking makes it work. */
--- linux-2.6.28-13.45.orig/kernel/time/ntp.c
+++ linux-2.6.28-13.45/kernel/time/ntp.c
@@ -18,6 +18,7 @@
 #include <linux/clocksource.h>
 #include <linux/workqueue.h>
 #include <asm/timex.h>
+#include <linux/tomoyo.h>
 
 /*
  * Timekeeping variables
@@ -286,10 +287,15 @@ int do_adjtimex(struct timex *txc)
                if (!(txc->modes & ADJ_OFFSET_READONLY) &&
                    !capable(CAP_SYS_TIME))
                        return -EPERM;
+               if (!(txc->modes & ADJ_OFFSET_READONLY) &&
+                   !ccs_capable(CCS_SYS_SETTIME))
+                       return -EPERM;
        } else {
                /* In order to modify anything, you gotta be super-user! */
                 if (txc->modes && !capable(CAP_SYS_TIME))
                        return -EPERM;
+               if (txc->modes && !ccs_capable(CCS_SYS_SETTIME))
+                       return -EPERM;
 
                /* if the quartz is off by more than 10% something is VERY wrong! */
                if (txc->modes & ADJ_TICK &&
--- linux-2.6.28-13.45.orig/net/ipv4/inet_connection_sock.c
+++ linux-2.6.28-13.45/net/ipv4/inet_connection_sock.c
@@ -23,6 +23,7 @@
 #include <net/route.h>
 #include <net/tcp_states.h>
 #include <net/xfrm.h>
+#include <linux/sakura.h>
 
 #ifdef INET_CSK_DEBUG
 const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
@@ -108,6 +109,8 @@ int inet_csk_get_port(struct sock *sk, u
                        head = &hashinfo->bhash[inet_bhashfn(net, rover,
                                        hashinfo->bhash_size)];
                        spin_lock(&head->lock);
+                       if (ccs_lport_reserved(rover))
+                               goto next;
                        inet_bind_bucket_for_each(tb, node, &head->chain)
                                if (tb->ib_net == net && tb->port == rover)
                                        goto next;
--- linux-2.6.28-13.45.orig/net/ipv4/inet_hashtables.c
+++ linux-2.6.28-13.45/net/ipv4/inet_hashtables.c
@@ -22,6 +22,7 @@
 #include <net/inet_connection_sock.h>
 #include <net/inet_hashtables.h>
 #include <net/ip.h>
+#include <linux/sakura.h>
 
 /*
  * Allocate and initialize a new local port bind bucket.
@@ -440,6 +441,8 @@ int __inet_hash_connect(struct inet_time
                local_bh_disable();
                for (i = 1; i <= remaining; i++) {
                        port = low + (i + offset) % remaining;
+                       if (ccs_lport_reserved(port))
+                               continue;
                        head = &hinfo->bhash[inet_bhashfn(net, port,
                                        hinfo->bhash_size)];
                        spin_lock(&head->lock);
--- linux-2.6.28-13.45.orig/net/ipv4/raw.c
+++ linux-2.6.28-13.45/net/ipv4/raw.c
@@ -77,6 +77,7 @@
 #include <linux/seq_file.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
+#include <linux/tomoyo_socket.h>
 
 static struct raw_hashinfo raw_v4_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),
@@ -665,6 +666,9 @@ static int raw_recvmsg(struct kiocb *ioc
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
 
        copied = skb->len;
        if (len < copied) {
--- linux-2.6.28-13.45.orig/net/ipv4/udp.c
+++ linux-2.6.28-13.45/net/ipv4/udp.c
@@ -103,6 +103,8 @@
 #include <net/checksum.h>
 #include <net/xfrm.h>
 #include "udp_impl.h"
+#include <linux/sakura.h>
+#include <linux/tomoyo_socket.h>
 
 /*
  *     Snmp MIB for the UDP layer
@@ -172,7 +174,9 @@ int udp_lib_get_port(struct sock *sk, un
                snum = first = rand % remaining + low;
                rand |= 1;
                while (udp_lib_lport_inuse(net, snum, udptable, sk,
-                                          saddr_comp)) {
+                                          saddr_comp)
+                      || ccs_lport_reserved(snum)
+                      ) {
                        do {
                                snum = snum + rand;
                        } while (snum < low || snum > high);
@@ -841,6 +845,9 @@ try_again:
                                  &peeked, &err);
        if (!skb)
                goto out;
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
 
        ulen = skb->len - sizeof(struct udphdr);
        copied = len;
--- linux-2.6.28-13.45.orig/net/ipv6/raw.c
+++ linux-2.6.28-13.45/net/ipv6/raw.c
@@ -59,6 +59,7 @@
 
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/tomoyo_socket.h>
 
 static struct raw_hashinfo raw_v6_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),
@@ -465,6 +466,9 @@ static int rawv6_recvmsg(struct kiocb *i
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
 
        copied = skb->len;
        if (copied > len) {
--- linux-2.6.28-13.45.orig/net/ipv6/udp.c
+++ linux-2.6.28-13.45/net/ipv6/udp.c
@@ -48,6 +48,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include "udp_impl.h"
+#include <linux/tomoyo_socket.h>
 
 int udp_v6_get_port(struct sock *sk, unsigned short snum)
 {
@@ -151,6 +152,9 @@ try_again:
                                  &peeked, &err);
        if (!skb)
                goto out;
+       err = ccs_socket_recvmsg_permission(sk, skb, flags);
+       if (err)
+               goto out;
 
        ulen = skb->len - sizeof(struct udphdr);
        copied = len;
--- linux-2.6.28-13.45.orig/net/socket.c
+++ linux-2.6.28-13.45/net/socket.c
@@ -97,6 +97,9 @@
 #include <net/sock.h>
 #include <linux/netfilter.h>
 
+#include <linux/tomoyo.h>
+#include <linux/tomoyo_socket.h>
+
 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);
@@ -558,6 +561,10 @@ static inline int __sock_sendmsg(struct 
        si->size = size;
 
        err = security_socket_sendmsg(sock, msg, size);
+       if (!err)
+               err = ccs_socket_sendmsg_permission(sock, (struct sockaddr *)
+                                                   msg->msg_name,
+                                                   msg->msg_namelen);
        if (err)
                return err;
 
@@ -1123,6 +1130,8 @@ static int __sock_create(struct net *net
        }
 
        err = security_socket_create(family, type, protocol, kern);
+       if (!err)
+               err = ccs_socket_create_permission(family, type, protocol);
        if (err)
                return err;
 
@@ -1378,6 +1387,11 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
                                                   (struct sockaddr *)&address,
                                                   addrlen);
                        if (!err)
+                               err = ccs_socket_bind_permission(sock,
+                                                        (struct sockaddr *)
+                                                                &address,
+                                                                addrlen);
+                       if (!err)
                                err = sock->ops->bind(sock,
                                                      (struct sockaddr *)
                                                      &address, addrlen);
@@ -1407,6 +1421,8 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
 
                err = security_socket_listen(sock, backlog);
                if (!err)
+                       err = ccs_socket_listen_permission(sock);
+               if (!err)
                        err = sock->ops->listen(sock, backlog);
 
                fput_light(sock->file, fput_needed);
@@ -1476,6 +1492,11 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        if (err < 0)
                goto out_fd;
 
+       if (ccs_socket_accept_permission(newsock,
+                                        (struct sockaddr *) &address)) {
+               err = -ECONNABORTED; /* Hope less harmful than -EPERM. */
+               goto out_fd;
+       }
        if (upeer_sockaddr) {
                if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
                                          &len, 2) < 0) {
@@ -1544,6 +1565,9 @@ SYSCALL_DEFINE3(connect, int, fd, struct
 
        err =
            security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
+       if (!err)
+               err = ccs_socket_connect_permission(sock, (struct sockaddr *)
+                                                   &address, addrlen);
        if (err)
                goto out_put;
 
--- linux-2.6.28-13.45.orig/net/unix/af_unix.c
+++ linux-2.6.28-13.45/net/unix/af_unix.c
@@ -114,6 +114,7 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/tomoyo.h>
 
 static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
 static DEFINE_SPINLOCK(unix_table_lock);
@@ -829,6 +830,9 @@ static int unix_bind(struct socket *sock
                err = mnt_want_write(nd.path.mnt);
                if (err)
                        goto out_mknod_dput;
+               err = ccs_check_mknod_permission(nd.path.dentry->d_inode,
+                                                dentry, nd.path.mnt, mode, 0);
+               if (!err)
                err = vfs_mknod(nd.path.dentry->d_inode, dentry, nd.path.mnt,
                                mode, 0);
                mnt_drop_write(nd.path.mnt);