ccs-patch/patches/ccs-patch-2.6.28-hardened-gentoo.diff

This is TOMOYO Linux patch for Hardened Gentoo.

Source code for this patch is "emerge hardened-sources"
---
 fs/compat.c                     |    3 ++-
 fs/compat_ioctl.c               |    3 +++
 fs/exec.c                       |   10 +++++++++-
 fs/fcntl.c                      |    4 ++++
 fs/ioctl.c                      |    3 +++
 fs/namei.c                      |   36 ++++++++++++++++++++++++++++++++++++
 fs/namespace.c                  |    9 +++++++++
 fs/open.c                       |   25 +++++++++++++++++++++++++
 fs/proc/version.c               |    7 +++++++
 include/linux/init_task.h       |    9 +++++++++
 include/linux/sched.h           |    6 ++++++
 kernel/compat.c                 |    3 +++
 kernel/kexec.c                  |    3 +++
 kernel/kmod.c                   |    5 +++++
 kernel/module.c                 |    5 +++++
 kernel/ptrace.c                 |    5 +++++
 kernel/sched.c                  |    3 +++
 kernel/signal.c                 |    9 +++++++++
 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                  |   12 +++++++++---
 net/ipv4/udp.c                  |   13 +++++++++++--
 net/ipv6/raw.c                  |   12 +++++++++---
 net/ipv6/udp.c                  |    9 ++++++++-
 net/socket.c                    |   22 ++++++++++++++++++++++
 net/unix/af_unix.c              |    9 +++++++++
 security/Kconfig                |    2 ++
 security/Makefile               |    3 +++
 32 files changed, 251 insertions(+), 11 deletions(-)

--- linux-2.6.28-hardened-r9.orig/fs/compat.c
+++ linux-2.6.28-hardened-r9/fs/compat.c
@@ -56,6 +56,7 @@
 #include <asm/mmu_context.h>
 #include <asm/ioctls.h>
 #include "internal.h"
+#include <linux/ccsecurity.h>
 
 int compat_log = 1;
 
@@ -1477,7 +1478,7 @@ int compat_do_execve(char * filename,
 
        gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
 
-       retval = search_binary_handler(bprm, regs);
+       retval = ccs_search_binary_handler(bprm, regs);
        if (retval >= 0) {
 #ifdef CONFIG_GRKERNSEC
                if (old_exec_file)
--- linux-2.6.28-hardened-r9.orig/fs/compat_ioctl.c
+++ linux-2.6.28-hardened-r9/fs/compat_ioctl.c
@@ -113,6 +113,7 @@
 #ifdef CONFIG_SPARC
 #include <asm/fbio.h>
 #endif
+#include <linux/ccsecurity.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_ioctl_permission(filp, cmd, arg);
        if (error)
                goto out_fput;
 
--- linux-2.6.28-hardened-r9.orig/fs/exec.c
+++ linux-2.6.28-hardened-r9/fs/exec.c
@@ -73,6 +73,8 @@ void (*pax_set_initial_flags_func)(struc
 EXPORT_SYMBOL(pax_set_initial_flags_func);
 #endif
 
+#include <linux/ccsecurity.h>
+
 int core_uses_pid;
 char core_pattern[CORENAME_MAX_SIZE] = "core";
 int suid_dumpable = 0;
@@ -141,6 +143,9 @@ SYSCALL_DEFINE1(uselib, const char __use
        error = vfs_permission(&nd, MAY_READ | MAY_EXEC | MAY_OPEN);
        if (error)
                goto exit;
+       error = ccs_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);
@@ -711,6 +716,9 @@ struct file *open_exec(const char *name)
        err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN);
        if (err)
                goto out_path_put;
+       err = ccs_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))
@@ -1412,7 +1420,7 @@ int do_execve(char * filename,
                goto out_fail;
 
        current->flags &= ~PF_KTHREAD;
-       retval = search_binary_handler(bprm,regs);
+       retval = ccs_search_binary_handler(bprm, regs);
        if (retval >= 0) {
 #ifdef CONFIG_GRKERNSEC
                if (old_exec_file)
--- linux-2.6.28-hardened-r9.orig/fs/fcntl.c
+++ linux-2.6.28-hardened-r9/fs/fcntl.c
@@ -24,6 +24,7 @@
 #include <asm/poll.h>
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
+#include <linux/ccsecurity.h>
 
 void set_close_on_exec(unsigned int fd, int flag)
 {
@@ -155,6 +156,9 @@ 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_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-hardened-r9.orig/fs/ioctl.c
+++ linux-2.6.28-hardened-r9/fs/ioctl.c
@@ -17,6 +17,7 @@
 #include <linux/buffer_head.h>
 
 #include <asm/ioctls.h>
+#include <linux/ccsecurity.h>
 
 /* So that the fiemap access checks can't overflow on 32 bit machines. */
 #define FIEMAP_MAX_EXTENTS     (UINT_MAX / sizeof(struct fiemap_extent))
@@ -483,6 +484,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
                goto out;
 
        error = security_file_ioctl(filp, cmd, arg);
+       if (!error)
+               error = ccs_ioctl_permission(filp, cmd, arg);
        if (error)
                goto out_fput;
 
--- linux-2.6.28-hardened-r9.orig/fs/namei.c
+++ linux-2.6.28-hardened-r9/fs/namei.c
@@ -35,6 +35,8 @@
 
 #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
 
+#include <linux/ccsecurity.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
@@ -1552,6 +1554,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_open_permission(dentry, nd->path.mnt, flag);
+       if (error)
+               return error;
+
        /*
         * Ensure there are no outstanding leases on the file.
         */
@@ -1603,6 +1610,9 @@ static int __open_namei_create(struct na
 
        if (!IS_POSIXACL(dir->d_inode))
                mode &= ~current->fs->umask;
+       error = ccs_mknod_permission(dir->d_inode, path->dentry, nd->path.mnt,
+                                    mode, 0);
+       if (!error)
        error = vfs_create(dir->d_inode, path->dentry, mode, nd);
        if (!error)
                gr_handle_create(path->dentry, nd->path.mnt);
@@ -1757,7 +1767,9 @@ do_last:
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit_mutex_unlock;
+               ccs_save_open_mode(open_flag);
                error = __open_namei_create(&nd, &path, flag, mode);
+               ccs_clear_open_mode();
                if (error) {
                        mnt_drop_write(nd.path.mnt);
                        goto exit;
@@ -1824,7 +1836,9 @@ ok:
                if (error)
                        goto exit;
        }
+       ccs_save_open_mode(open_flag);
        error = may_open(&nd, acc_mode, flag);
+       ccs_clear_open_mode();
        if (error) {
                if (will_write)
                        mnt_drop_write(nd.path.mnt);
@@ -2062,6 +2076,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_mknod_permission(nd.path.dentry->d_inode, dentry,
+                                    nd.path.mnt, mode, dev);
+       if (!error)
        switch (mode & S_IFMT) {
                case 0: case S_IFREG:
                        error = vfs_create(nd.path.dentry->d_inode,dentry,mode,&nd);
@@ -2141,6 +2158,9 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_mkdir_permission(nd.path.dentry->d_inode, dentry,
+                                    nd.path.mnt, mode);
+       if (!error)
        error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
        mnt_drop_write(nd.path.mnt);
 
@@ -2270,6 +2290,9 @@ static long do_rmdir(int dfd, const char
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto exit3;
+       error = ccs_rmdir_permission(nd.path.dentry->d_inode, dentry,
+                                    nd.path.mnt);
+       if (!error)
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
        mnt_drop_write(nd.path.mnt);
        if (!error && (saved_dev || saved_ino))
@@ -2370,6 +2393,9 @@ static long do_unlinkat(int dfd, const c
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit2;
+               error = ccs_unlink_permission(nd.path.dentry->d_inode,
+                                             dentry, nd.path.mnt);
+               if (!error)
                error = vfs_unlink(nd.path.dentry->d_inode, dentry);
                if (!error && (saved_ino || saved_dev))
                        gr_handle_delete(saved_ino, saved_dev);
@@ -2458,6 +2484,9 @@ SYSCALL_DEFINE3(symlinkat, const char __
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_symlink_permission(nd.path.dentry->d_inode, dentry,
+                                      nd.path.mnt, from);
+       if (!error)
        error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
        if (!error)
                gr_handle_create(dentry, nd.path.mnt);
@@ -2570,6 +2599,9 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
+       error = ccs_link_permission(old_path.dentry, nd.path.dentry->d_inode,
+                                   new_dentry, nd.path.mnt);
+       if (!error)
        error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
        if (!error)
                gr_handle_create(new_dentry, nd.path.mnt);
@@ -2814,6 +2846,10 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        error = mnt_want_write(oldnd.path.mnt);
        if (error)
                goto exit5;
+       error = ccs_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,
                                   new_dir->d_inode, new_dentry);
        if (!error)
--- linux-2.6.28-hardened-r9.orig/fs/namespace.c
+++ linux-2.6.28-hardened-r9/fs/namespace.c
@@ -31,6 +31,7 @@
 #include <asm/unistd.h>
 #include "pnode.h"
 #include "internal.h"
+#include <linux/ccsecurity.h>
 
 #define HASH_SHIFT ilog2(PAGE_SIZE / sizeof(struct list_head))
 #define HASH_SIZE (1UL << HASH_SHIFT)
@@ -1038,6 +1039,8 @@ static int do_umount(struct vfsmount *mn
        LIST_HEAD(umount_list);
 
        retval = security_sb_umount(mnt, flags);
+       if (!retval)
+               retval = ccs_umount_permission(mnt, flags);
        if (retval)
                return retval;
 
@@ -1904,6 +1907,7 @@ int copy_mount_options(const void __user
 long do_mount(char *dev_name, char *dir_name, char *type_page,
                  unsigned long flags, void *data_page)
 {
+       const unsigned long original_flags = flags;
        struct path path;
        int retval = 0;
        int mnt_flags = 0;
@@ -1948,6 +1952,9 @@ long do_mount(char *dev_name, char *dir_
 
        retval = security_sb_mount(dev_name, &path,
                                   type_page, flags, data_page);
+       if (!retval)
+               retval = ccs_mount_permission(dev_name, &path, type_page,
+                                             original_flags, data_page);
        if (retval)
                goto dput_out;
 
@@ -2209,6 +2216,8 @@ SYSCALL_DEFINE2(pivot_root, const char _
                goto out1;
 
        error = security_sb_pivotroot(&old, &new);
+       if (!error)
+               error = ccs_pivot_root_permission(&old, &new);
        if (error) {
                path_put(&old);
                goto out1;
--- linux-2.6.28-hardened-r9.orig/fs/open.c
+++ linux-2.6.28-hardened-r9/fs/open.c
@@ -29,6 +29,7 @@
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
 #include <linux/falloc.h>
+#include <linux/ccsecurity.h>
 
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
@@ -272,6 +273,9 @@ static long do_sys_truncate(const char _
        if (error)
                goto put_write_and_out;
 
+       error = ccs_truncate_permission(path.dentry, path.mnt);
+       if (error)
+               goto put_write_and_out;
        error = locks_verify_truncate(inode, NULL, length);
        if (!error) {
                DQUOT_INIT(inode);
@@ -328,6 +332,9 @@ static long do_sys_ftruncate(unsigned in
        if (IS_APPEND(inode))
                goto out_putf;
 
+       error = ccs_truncate_permission(dentry, file->f_vfsmnt);
+       if (error)
+               goto out_putf;
        error = locks_verify_truncate(inode, file, length);
        if (!error)
                error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file);
@@ -605,6 +612,8 @@ SYSCALL_DEFINE1(chroot, const char __use
        error = -EPERM;
        if (!capable(CAP_SYS_CHROOT))
                goto dput_and_out;
+       if (ccs_chroot_permission(&path))
+               goto dput_and_out;
 
        if (gr_handle_chroot_chroot(path.dentry, path.mnt))
                goto dput_and_out;
@@ -641,6 +650,9 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
        err = mnt_want_write(file->f_path.mnt);
        if (err)
                goto out_putf;
+       err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode);
+       if (err)
+               goto out_drop_write;
 
        if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
                err = -EACCES;
@@ -685,6 +697,9 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
        error = mnt_want_write(path.mnt);
        if (error)
                goto dput_and_out;
+       error = ccs_chmod_permission(path.dentry, path.mnt, mode);
+       if (error)
+               goto out_drop_write;
 
        if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
                error = -EACCES;
@@ -758,6 +773,8 @@ SYSCALL_DEFINE3(chown, const char __user
        error = mnt_want_write(path.mnt);
        if (error)
                goto out_release;
+       error = ccs_chown_permission(path.dentry, path.mnt, user, group);
+       if (!error)
        error = chown_common(path.dentry, user, group, path.mnt);
        mnt_drop_write(path.mnt);
 out_release:
@@ -783,6 +800,8 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
        error = mnt_want_write(path.mnt);
        if (error)
                goto out_release;
+       error = ccs_chown_permission(path.dentry, path.mnt, user, group);
+       if (!error)
        error = chown_common(path.dentry, user, group, path.mnt);
        mnt_drop_write(path.mnt);
 out_release:
@@ -802,6 +821,8 @@ SYSCALL_DEFINE3(lchown, const char __use
        error = mnt_want_write(path.mnt);
        if (error)
                goto out_release;
+       error = ccs_chown_permission(path.dentry, path.mnt, user, group);
+       if (!error)
        error = chown_common(path.dentry, user, group, path.mnt);
        mnt_drop_write(path.mnt);
 out_release:
@@ -825,6 +846,8 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd
                goto out_fput;
        dentry = file->f_path.dentry;
        audit_inode(NULL, dentry);
+       error = ccs_chown_permission(dentry, file->f_vfsmnt, user, group);
+       if (!error)
        error = chown_common(dentry, user, group, file->f_path.mnt);
        mnt_drop_write(file->f_path.mnt);
 out_fput:
@@ -1211,6 +1234,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-hardened-r9.orig/fs/proc/version.c
+++ linux-2.6.28-hardened-r9/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-hardened-r9 2010/08/23\n");
+       return 0;
+}
+module_init(ccs_show_version);
--- linux-2.6.28-hardened-r9.orig/include/linux/init_task.h
+++ linux-2.6.28-hardened-r9/include/linux/init_task.h
@@ -113,6 +113,14 @@ extern struct group_info init_groups;
 # define CAP_INIT_BSET  CAP_INIT_EFF_SET
 #endif
 
+#ifdef CONFIG_CCSECURITY
+#define INIT_CCSECURITY          \
+       .ccs_domain_info = NULL, \
+       .ccs_flags = 0,
+#else
+#define INIT_CCSECURITY
+#endif
+
 /*
  *  INIT_TASK is used to set up the first task table, touch at
  * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -180,6 +188,7 @@ extern struct group_info init_groups;
        INIT_IDS                                                        \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+       INIT_CCSECURITY                                                 \
 }
 
 
--- linux-2.6.28-hardened-r9.orig/include/linux/sched.h
+++ linux-2.6.28-hardened-r9/include/linux/sched.h
@@ -41,6 +41,8 @@
 
 #ifdef __KERNEL__
 
+struct ccs_domain_info;
+
 struct sched_param {
        int sched_priority;
 };
@@ -1377,6 +1379,10 @@ struct task_struct {
        u8 brute;
 #endif
 
+#ifdef CONFIG_CCSECURITY
+       struct ccs_domain_info *ccs_domain_info;
+       u32 ccs_flags;
+#endif
 };
 
 #define MF_PAX_PAGEEXEC                0x01000000      /* Paging based non-executable pages */
--- linux-2.6.28-hardened-r9.orig/kernel/compat.c
+++ linux-2.6.28-hardened-r9/kernel/compat.c
@@ -26,6 +26,7 @@
 #include <linux/times.h>
 
 #include <asm/uaccess.h>
+#include <linux/ccsecurity.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-hardened-r9.orig/kernel/kexec.c
+++ linux-2.6.28-hardened-r9/kernel/kexec.c
@@ -37,6 +37,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/sections.h>
+#include <linux/ccsecurity.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-hardened-r9.orig/kernel/kmod.c
+++ linux-2.6.28-hardened-r9/kernel/kmod.c
@@ -174,6 +174,11 @@ static int ____call_usermodehelper(void 
         */
        set_user_nice(current, 0);
 
+#ifdef CONFIG_CCSECURITY
+       current->ccs_domain_info = NULL;
+       current->ccs_flags = 0;
+#endif
+
        retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
 
        /* Exec failed? */
--- linux-2.6.28-hardened-r9.orig/kernel/module.c
+++ linux-2.6.28-hardened-r9/kernel/module.c
@@ -56,6 +56,7 @@
 #include <asm/sections.h>
 #include <linux/tracepoint.h>
 #include <linux/ftrace.h>
+#include <linux/ccsecurity.h>
 
 #if 0
 #define DEBUGP printk
@@ -769,6 +770,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;
@@ -2449,6 +2452,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-hardened-r9.orig/kernel/ptrace.c
+++ linux-2.6.28-hardened-r9/kernel/ptrace.c
@@ -24,6 +24,7 @@
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
+#include <linux/ccsecurity.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_ptrace_permission(request, pid))
+               return -EPERM;
 
        /*
         * This lock_kernel fixes a subtle race with suid exec
@@ -677,6 +680,8 @@ asmlinkage long compat_sys_ptrace(compat
 {
        struct task_struct *child;
        long ret;
+       if (ccs_ptrace_permission(request, pid))
+               return -EPERM;
 
        /*
         * This lock_kernel fixes a subtle race with suid exec
--- linux-2.6.28-hardened-r9.orig/kernel/sched.c
+++ linux-2.6.28-hardened-r9/kernel/sched.c
@@ -76,6 +76,7 @@
 
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
+#include <linux/ccsecurity.h>
 
 #include "sched_cpupri.h"
 
@@ -5077,6 +5078,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-hardened-r9.orig/kernel/signal.c
+++ linux-2.6.28-hardened-r9/kernel/signal.c
@@ -34,6 +34,7 @@
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
 #include "audit.h"     /* audit_signal_info() */
+#include <linux/ccsecurity.h>
 
 /*
  * SLAB caches for signal bits.
@@ -2218,6 +2219,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;
@@ -2279,6 +2282,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);
 }
@@ -2291,6 +2296,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);
 }
@@ -2308,6 +2315,8 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, 
        if (info.si_code >= 0)
                return -EPERM;
        info.si_signo = sig;
+       if (ccs_sigqueue_permission(pid, sig))
+               return -EPERM;
 
        /* POSIX.1b doesn't mention process groups.  */
        return kill_proc_info(sig, &info, pid);
--- linux-2.6.28-hardened-r9.orig/kernel/sys.c
+++ linux-2.6.28-hardened-r9/kernel/sys.c
@@ -42,6 +42,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unistd.h>
+#include <linux/ccsecurity.h>
 
 #ifndef SET_UNALIGN_CTL
 # define SET_UNALIGN_CTL(a,b)  (-EINVAL)
@@ -152,6 +153,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;
@@ -369,6 +374,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.
@@ -1387,6 +1394,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)) {
@@ -1436,6 +1445,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-hardened-r9.orig/kernel/sysctl.c
+++ linux-2.6.28-hardened-r9/kernel/sysctl.c
@@ -51,6 +51,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
+#include <linux/ccsecurity.h>
 
 #ifdef CONFIG_X86
 #include <asm/nmi.h>
@@ -1667,6 +1668,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-hardened-r9.orig/kernel/time.c
+++ linux-2.6.28-hardened-r9/kernel/time.c
@@ -40,6 +40,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+#include <linux/ccsecurity.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);
 
@@ -164,6 +167,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-hardened-r9.orig/kernel/time/ntp.c
+++ linux-2.6.28-hardened-r9/kernel/time/ntp.c
@@ -18,6 +18,7 @@
 #include <linux/clocksource.h>
 #include <linux/workqueue.h>
 #include <asm/timex.h>
+#include <linux/ccsecurity.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-hardened-r9.orig/net/ipv4/inet_connection_sock.c
+++ linux-2.6.28-hardened-r9/net/ipv4/inet_connection_sock.c
@@ -24,6 +24,7 @@
 #include <net/route.h>
 #include <net/tcp_states.h>
 #include <net/xfrm.h>
+#include <linux/ccsecurity.h>
 
 #ifdef INET_CSK_DEBUG
 const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
@@ -109,6 +110,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-hardened-r9.orig/net/ipv4/inet_hashtables.c
+++ linux-2.6.28-hardened-r9/net/ipv4/inet_hashtables.c
@@ -23,6 +23,7 @@
 #include <net/inet_connection_sock.h>
 #include <net/inet_hashtables.h>
 #include <net/ip.h>
+#include <linux/ccsecurity.h>
 
 extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
 
@@ -443,6 +444,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-hardened-r9.orig/net/ipv4/raw.c
+++ linux-2.6.28-hardened-r9/net/ipv4/raw.c
@@ -77,6 +77,7 @@
 #include <linux/seq_file.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
+#include <linux/ccsecurity.h>
 
 static struct raw_hashinfo raw_v4_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),
@@ -662,9 +663,14 @@ static int raw_recvmsg(struct kiocb *ioc
                goto out;
        }
 
-       skb = skb_recv_datagram(sk, flags, noblock, &err);
-       if (!skb)
-               goto out;
+       for (;;) {
+               skb = skb_recv_datagram(sk, flags, noblock, &err);
+               if (!skb)
+                       goto out;
+               if (!ccs_socket_post_recvmsg_permission(sk, skb))
+                       break;
+               skb_kill_datagram(sk, skb, flags);
+       }
 
        copied = skb->len;
        if (len < copied) {
--- linux-2.6.28-hardened-r9.orig/net/ipv4/udp.c
+++ linux-2.6.28-hardened-r9/net/ipv4/udp.c
@@ -104,6 +104,7 @@
 #include <net/checksum.h>
 #include <net/xfrm.h>
 #include "udp_impl.h"
+#include <linux/ccsecurity.h>
 
 extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
 extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
@@ -176,7 +177,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);
@@ -846,6 +849,7 @@ int udp_recvmsg(struct kiocb *iocb, stru
        int peeked;
        int err;
        int is_udplite = IS_UDPLITE(sk);
+       _Bool update_stat;
 
        /*
         *      Check any passed addresses
@@ -861,6 +865,11 @@ try_again:
                                  &peeked, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb)) {
+               update_stat = 0;
+               goto csum_copy_err;
+       }
+       update_stat = 1;
 
        err = gr_search_udp_recvmsg(sk, skb);
        if (err)
@@ -927,7 +936,7 @@ out:
 
 csum_copy_err:
        lock_sock(sk);
-       if (!skb_kill_datagram(sk, skb, flags))
+       if (!skb_kill_datagram(sk, skb, flags) && update_stat)
                UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
        release_sock(sk);
 
--- linux-2.6.28-hardened-r9.orig/net/ipv6/raw.c
+++ linux-2.6.28-hardened-r9/net/ipv6/raw.c
@@ -59,6 +59,7 @@
 
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/ccsecurity.h>
 
 static struct raw_hashinfo raw_v6_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),
@@ -462,9 +463,14 @@ static int rawv6_recvmsg(struct kiocb *i
        if (flags & MSG_ERRQUEUE)
                return ipv6_recv_error(sk, msg, len);
 
-       skb = skb_recv_datagram(sk, flags, noblock, &err);
-       if (!skb)
-               goto out;
+       for (;;) {
+               skb = skb_recv_datagram(sk, flags, noblock, &err);
+               if (!skb)
+                       goto out;
+               if (!ccs_socket_post_recvmsg_permission(sk, skb))
+                       break;
+               skb_kill_datagram(sk, skb, flags);
+       }
 
        copied = skb->len;
        if (copied > len) {
--- linux-2.6.28-hardened-r9.orig/net/ipv6/udp.c
+++ linux-2.6.28-hardened-r9/net/ipv6/udp.c
@@ -48,6 +48,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include "udp_impl.h"
+#include <linux/ccsecurity.h>
 
 int udp_v6_get_port(struct sock *sk, unsigned short snum)
 {
@@ -139,6 +140,7 @@ int udpv6_recvmsg(struct kiocb *iocb, st
        int err;
        int is_udplite = IS_UDPLITE(sk);
        int is_udp4;
+       _Bool update_stat;
 
        if (addr_len)
                *addr_len=sizeof(struct sockaddr_in6);
@@ -151,6 +153,11 @@ try_again:
                                  &peeked, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb)) {
+               update_stat = 0;
+               goto csum_copy_err;
+       }
+       update_stat = 1;
 
        ulen = skb->len - sizeof(struct udphdr);
        copied = len;
@@ -236,7 +243,7 @@ out:
 
 csum_copy_err:
        lock_sock(sk);
-       if (!skb_kill_datagram(sk, skb, flags)) {
+       if (!skb_kill_datagram(sk, skb, flags) && update_stat) {
                if (is_udp4)
                        UDP_INC_STATS_USER(sock_net(sk),
                                        UDP_MIB_INERRORS, is_udplite);
--- linux-2.6.28-hardened-r9.orig/net/socket.c
+++ linux-2.6.28-hardened-r9/net/socket.c
@@ -113,6 +113,8 @@ extern int gr_search_accept(struct socke
 extern int gr_search_socket(const int domain, const int type,
                            const int protocol);
 
+#include <linux/ccsecurity.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);
@@ -574,6 +576,8 @@ static inline int __sock_sendmsg(struct 
        si->size = size;
 
        err = security_socket_sendmsg(sock, msg, size);
+       if (!err)
+               err = ccs_socket_sendmsg_permission(sock, msg, size);
        if (err)
                return err;
 
@@ -1139,6 +1143,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;
 
@@ -1412,6 +1418,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);
@@ -1451,6 +1462,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);
 
 error:
@@ -1489,6 +1502,7 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        if (!sock)
                goto out;
 
+retry:
        err = -ENFILE;
        if (!(newsock = sock_alloc()))
                goto out_put;
@@ -1533,6 +1547,11 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        if (err < 0)
                goto out_fd;
 
+       if (ccs_socket_post_accept_permission(sock, newsock)) {
+               fput(newfile);
+               put_unused_fd(newfd);
+               goto retry;
+       }
        if (upeer_sockaddr) {
                if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
                                          &len, 2) < 0) {
@@ -1614,6 +1633,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-hardened-r9.orig/net/unix/af_unix.c
+++ linux-2.6.28-hardened-r9/net/unix/af_unix.c
@@ -114,6 +114,7 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/ccsecurity.h>
 
 static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
 static DEFINE_SPINLOCK(unix_table_lock);
@@ -849,6 +850,9 @@ static int unix_bind(struct socket *sock
                        goto out_mknod_dput;
                }
 
+               err = ccs_mknod_permission(nd.path.dentry->d_inode, dentry,
+                                          nd.path.mnt, mode, 0);
+               if (!err)
                err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
                mnt_drop_write(nd.path.mnt);
                if (err)
@@ -1672,6 +1676,7 @@ static int unix_dgram_recvmsg(struct kio
 
        mutex_lock(&u->readlock);
 
+retry:
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb) {
                unix_state_lock(sk);
@@ -1685,6 +1690,10 @@ static int unix_dgram_recvmsg(struct kio
 
        wake_up_interruptible_sync(&u->peer_wait);
 
+       if (ccs_socket_post_recvmsg_permission(sk, skb)) {
+               skb_kill_datagram(sk, skb, flags);
+               goto retry;
+       }
        if (msg->msg_name)
                unix_copy_addr(msg, skb->sk);
 
--- linux-2.6.28-hardened-r9.orig/security/Kconfig
+++ linux-2.6.28-hardened-r9/security/Kconfig
@@ -567,5 +567,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
 source security/selinux/Kconfig
 source security/smack/Kconfig
 
+source security/ccsecurity/Kconfig
+
 endmenu
 
--- linux-2.6.28-hardened-r9.orig/security/Makefile
+++ linux-2.6.28-hardened-r9/security/Makefile
@@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin
 obj-$(CONFIG_SECURITY_SMACK)           += smack/built-in.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)                += root_plug.o
 obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o
+
+subdir-$(CONFIG_CCSECURITY)+= ccsecurity
+obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o