caitsith-patch/patches/ccs-patch-3.6.diff

This is TOMOYO Linux patch for kernel 3.6.11.

Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.6.11.tar.xz
---
 fs/exec.c                 |    2 
 fs/open.c                 |    2 
 fs/proc/version.c         |    7 ++
 include/linux/init_task.h |    9 +++
 include/linux/sched.h     |    6 ++
 include/linux/security.h  |   55 ++++++++++--------
 include/net/ip.h          |    2 
 kernel/fork.c             |    5 +
 kernel/kexec.c            |    3 +
 kernel/module.c           |    5 +
 kernel/ptrace.c           |   10 +++
 kernel/sched/core.c       |    2 
 kernel/signal.c           |   10 +++
 kernel/sys.c              |   10 +++
 kernel/time/ntp.c         |    8 ++
 net/ipv4/raw.c            |    4 +
 net/ipv4/udp.c            |    4 +
 net/ipv6/raw.c            |    4 +
 net/ipv6/udp.c            |    4 +
 net/socket.c              |    4 +
 net/unix/af_unix.c        |    4 +
 security/Kconfig          |    2 
 security/Makefile         |    3 +
 security/security.c       |  134 +++++++++++++++++++++++++++++++++++++---------
 24 files changed, 250 insertions(+), 49 deletions(-)

--- linux-3.6.11.orig/fs/exec.c
+++ linux-3.6.11/fs/exec.c
@@ -1551,7 +1551,7 @@ static int do_execve_common(const char *
        if (retval < 0)
                goto out;
 
-       retval = search_binary_handler(bprm,regs);
+       retval = ccs_search_binary_handler(bprm, regs);
        if (retval < 0)
                goto out;
 
--- linux-3.6.11.orig/fs/open.c
+++ linux-3.6.11/fs/open.c
@@ -1077,6 +1077,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-3.6.11.orig/fs/proc/version.c
+++ linux-3.6.11/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: 3.6.11 2012/12/21\n");
+       return 0;
+}
+module_init(ccs_show_version);
--- linux-3.6.11.orig/include/linux/init_task.h
+++ linux-3.6.11/include/linux/init_task.h
@@ -143,6 +143,14 @@ extern struct task_group root_task_group
 
 #define INIT_TASK_COMM "swapper"
 
+#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY)
+#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)
@@ -210,6 +218,7 @@ extern struct task_group root_task_group
        INIT_TRACE_RECURSION                                            \
        INIT_TASK_RCU_PREEMPT(tsk)                                      \
        INIT_CPUSET_SEQ                                                 \
+       INIT_CCSECURITY                                                 \
 }
 
 
--- linux-3.6.11.orig/include/linux/sched.h
+++ linux-3.6.11/include/linux/sched.h
@@ -44,6 +44,8 @@
 
 #ifdef __KERNEL__
 
+struct ccs_domain_info;
+
 struct sched_param {
        int sched_priority;
 };
@@ -1589,6 +1591,10 @@ struct task_struct {
 #ifdef CONFIG_UPROBES
        struct uprobe_task *utask;
 #endif
+#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY)
+       struct ccs_domain_info *ccs_domain_info;
+       u32 ccs_flags;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
--- linux-3.6.11.orig/include/linux/security.h
+++ linux-3.6.11/include/linux/security.h
@@ -52,6 +52,7 @@ struct msg_queue;
 struct xattr;
 struct xfrm_sec_ctx;
 struct mm_struct;
+#include <linux/ccsecurity.h>
 
 /* Maximum number of letters for an LSM name string */
 #define SECURITY_NAME_MAX      10
@@ -1899,7 +1900,10 @@ static inline int security_syslog(int ty
 static inline int security_settime(const struct timespec *ts,
                                   const struct timezone *tz)
 {
-       return cap_settime(ts, tz);
+       int error = cap_settime(ts, tz);
+       if (!error && !ccs_capable(CCS_SYS_SETTIME))
+               error = -EPERM;
+       return error;
 }
 
 static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
@@ -1968,18 +1972,18 @@ static inline int security_sb_mount(char
                                    char *type, unsigned long flags,
                                    void *data)
 {
-       return 0;
+       return ccs_mount_permission(dev_name, path, type, flags, data);
 }
 
 static inline int security_sb_umount(struct vfsmount *mnt, int flags)
 {
-       return 0;
+       return ccs_umount_permission(mnt, flags);
 }
 
 static inline int security_sb_pivotroot(struct path *old_path,
                                        struct path *new_path)
 {
-       return 0;
+       return ccs_pivot_root_permission(old_path, new_path);
 }
 
 static inline int security_sb_set_mnt_opts(struct super_block *sb,
@@ -2103,7 +2107,7 @@ static inline int security_inode_setattr
 static inline int security_inode_getattr(struct vfsmount *mnt,
                                          struct dentry *dentry)
 {
-       return 0;
+       return ccs_getattr_permission(mnt, dentry);
 }
 
 static inline int security_inode_setxattr(struct dentry *dentry,
@@ -2179,7 +2183,7 @@ static inline void security_file_free(st
 static inline int security_file_ioctl(struct file *file, unsigned int cmd,
                                      unsigned long arg)
 {
-       return 0;
+       return ccs_ioctl_permission(file, cmd, arg);
 }
 
 static inline int security_mmap_file(struct file *file, unsigned long prot,
@@ -2208,7 +2212,7 @@ static inline int security_file_lock(str
 static inline int security_file_fcntl(struct file *file, unsigned int cmd,
                                      unsigned long arg)
 {
-       return 0;
+       return ccs_fcntl_permission(file, cmd, arg);
 }
 
 static inline int security_file_set_fowner(struct file *file)
@@ -2231,7 +2235,7 @@ static inline int security_file_receive(
 static inline int security_file_open(struct file *file,
                                     const struct cred *cred)
 {
-       return 0;
+       return ccs_open_permission(file);
 }
 
 static inline int security_task_create(unsigned long clone_flags)
@@ -2574,7 +2578,7 @@ static inline int security_unix_may_send
 static inline int security_socket_create(int family, int type,
                                         int protocol, int kern)
 {
-       return 0;
+       return ccs_socket_create_permission(family, type, protocol);
 }
 
 static inline int security_socket_post_create(struct socket *sock,
@@ -2589,19 +2593,19 @@ static inline int security_socket_bind(s
                                       struct sockaddr *address,
                                       int addrlen)
 {
-       return 0;
+       return ccs_socket_bind_permission(sock, address, addrlen);
 }
 
 static inline int security_socket_connect(struct socket *sock,
                                          struct sockaddr *address,
                                          int addrlen)
 {
-       return 0;
+       return ccs_socket_connect_permission(sock, address, addrlen);
 }
 
 static inline int security_socket_listen(struct socket *sock, int backlog)
 {
-       return 0;
+       return ccs_socket_listen_permission(sock);
 }
 
 static inline int security_socket_accept(struct socket *sock,
@@ -2613,7 +2617,7 @@ static inline int security_socket_accept
 static inline int security_socket_sendmsg(struct socket *sock,
                                          struct msghdr *msg, int size)
 {
-       return 0;
+       return ccs_socket_sendmsg_permission(sock, msg, size);
 }
 
 static inline int security_socket_recvmsg(struct socket *sock,
@@ -2834,44 +2838,47 @@ int security_path_chmod(struct path *pat
 int security_path_chown(struct path *path, uid_t uid, gid_t gid);
 int security_path_chroot(struct path *path);
 #else  /* CONFIG_SECURITY_PATH */
+
+#include <linux/path.h>
+
 static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
 {
-       return 0;
+       return ccs_unlink_permission(dentry, dir->mnt);
 }
 
 static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,
                                      umode_t mode)
 {
-       return 0;
+       return ccs_mkdir_permission(dentry, dir->mnt, mode);
 }
 
 static inline int security_path_rmdir(struct path *dir, struct dentry *dentry)
 {
-       return 0;
+       return ccs_rmdir_permission(dentry, dir->mnt);
 }
 
 static inline int security_path_mknod(struct path *dir, struct dentry *dentry,
                                      umode_t mode, unsigned int dev)
 {
-       return 0;
+       return ccs_mknod_permission(dentry, dir->mnt, mode, dev);
 }
 
 static inline int security_path_truncate(struct path *path)
 {
-       return 0;
+       return ccs_truncate_permission(path->dentry, path->mnt);
 }
 
 static inline int security_path_symlink(struct path *dir, struct dentry *dentry,
                                        const char *old_name)
 {
-       return 0;
+       return ccs_symlink_permission(dentry, dir->mnt, old_name);
 }
 
 static inline int security_path_link(struct dentry *old_dentry,
                                     struct path *new_dir,
                                     struct dentry *new_dentry)
 {
-       return 0;
+       return ccs_link_permission(old_dentry, new_dentry, new_dir->mnt);
 }
 
 static inline int security_path_rename(struct path *old_dir,
@@ -2879,22 +2886,22 @@ static inline int security_path_rename(s
                                       struct path *new_dir,
                                       struct dentry *new_dentry)
 {
-       return 0;
+       return ccs_rename_permission(old_dentry, new_dentry, new_dir->mnt);
 }
 
 static inline int security_path_chmod(struct path *path, umode_t mode)
 {
-       return 0;
+       return ccs_chmod_permission(path->dentry, path->mnt, mode);
 }
 
 static inline int security_path_chown(struct path *path, uid_t uid, gid_t gid)
 {
-       return 0;
+       return ccs_chown_permission(path->dentry, path->mnt, uid, gid);
 }
 
 static inline int security_path_chroot(struct path *path)
 {
-       return 0;
+       return ccs_chroot_permission(path);
 }
 #endif /* CONFIG_SECURITY_PATH */
 
--- linux-3.6.11.orig/include/net/ip.h
+++ linux-3.6.11/include/net/ip.h
@@ -201,6 +201,8 @@ extern void inet_get_local_port_range(in
 extern unsigned long *sysctl_local_reserved_ports;
 static inline int inet_is_reserved_local_port(int port)
 {
+       if (ccs_lport_reserved(port))
+               return 1;
        return test_bit(port, sysctl_local_reserved_ports);
 }
 
--- linux-3.6.11.orig/kernel/fork.c
+++ linux-3.6.11/kernel/fork.c
@@ -241,6 +241,7 @@ void __put_task_struct(struct task_struc
        delayacct_tsk_free(tsk);
        put_signal_struct(tsk->signal);
 
+       ccs_free_task_security(tsk);
        if (!profile_handoff_task(tsk))
                free_task(tsk);
 }
@@ -1320,6 +1321,9 @@ static struct task_struct *copy_process(
        retval = audit_alloc(p);
        if (retval)
                goto bad_fork_cleanup_policy;
+       retval = ccs_alloc_task_security(p);
+       if (retval)
+               goto bad_fork_cleanup_audit;
        /* copy all the process information */
        retval = copy_semundo(clone_flags, p);
        if (retval)
@@ -1520,6 +1524,7 @@ bad_fork_cleanup_semundo:
        exit_sem(p);
 bad_fork_cleanup_audit:
        audit_free(p);
+       ccs_free_task_security(p);
 bad_fork_cleanup_policy:
        perf_event_free_task(p);
 #ifdef CONFIG_NUMA
--- linux-3.6.11.orig/kernel/kexec.c
+++ linux-3.6.11/kernel/kexec.c
@@ -38,6 +38,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/ccsecurity.h>
 
 /* Per cpu memory for storing cpu states in case of system crash. */
 note_buf_t __percpu *crash_notes;
@@ -946,6 +947,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-3.6.11.orig/kernel/module.c
+++ linux-3.6.11/kernel/module.c
@@ -58,6 +58,7 @@
 #include <linux/jump_label.h>
 #include <linux/pfn.h>
 #include <linux/bsearch.h>
+#include <linux/ccsecurity.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/module.h>
@@ -774,6 +775,8 @@ SYSCALL_DEFINE2(delete_module, const cha
 
        if (!capable(CAP_SYS_MODULE) || modules_disabled)
                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;
@@ -3025,6 +3028,8 @@ SYSCALL_DEFINE3(init_module, void __user
        /* Must have permission */
        if (!capable(CAP_SYS_MODULE) || modules_disabled)
                return -EPERM;
+       if (!ccs_capable(CCS_USE_KERNEL_MODULE))
+               return -EPERM;
 
        /* Do all the hard work */
        mod = load_module(umod, len, uargs);
--- linux-3.6.11.orig/kernel/ptrace.c
+++ linux-3.6.11/kernel/ptrace.c
@@ -859,6 +859,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
 {
        struct task_struct *child;
        long ret;
+       {
+               const int rc = ccs_ptrace_permission(request, pid);
+               if (rc)
+                       return rc;
+       }
 
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
@@ -1004,6 +1009,11 @@ asmlinkage long compat_sys_ptrace(compat
 {
        struct task_struct *child;
        long ret;
+       {
+               const int rc = ccs_ptrace_permission(request, pid);
+               if (rc)
+                       return rc;
+       }
 
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
--- linux-3.6.11.orig/kernel/sched/core.c
+++ linux-3.6.11/kernel/sched/core.c
@@ -4119,6 +4119,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-3.6.11.orig/kernel/signal.c
+++ linux-3.6.11/kernel/signal.c
@@ -2856,6 +2856,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;
@@ -2924,6 +2926,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);
 }
@@ -2940,6 +2944,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);
 }
@@ -2967,6 +2973,8 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, 
                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);
@@ -2987,6 +2995,8 @@ long do_rt_tgsigqueueinfo(pid_t tgid, pi
                return -EPERM;
        }
        info->si_signo = sig;
+       if (ccs_tgsigqueue_permission(tgid, pid, sig))
+               return -EPERM;
 
        return do_send_specific(tgid, pid, sig, info);
 }
--- linux-3.6.11.orig/kernel/sys.c
+++ linux-3.6.11/kernel/sys.c
@@ -180,6 +180,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;
@@ -447,6 +451,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;
 
        /*
         * If pid namespaces are enabled and the current task is in a child
@@ -1375,6 +1381,8 @@ SYSCALL_DEFINE2(sethostname, char __user
 
        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)) {
@@ -1425,6 +1433,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-3.6.11.orig/kernel/time/ntp.c
+++ linux-3.6.11/kernel/time/ntp.c
@@ -15,6 +15,7 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/ccsecurity.h>
 
 #include "tick-internal.h"
 
@@ -630,10 +631,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% then
@@ -651,6 +657,8 @@ int do_adjtimex(struct timex *txc)
                delta.tv_nsec = txc->time.tv_usec;
                if (!capable(CAP_SYS_TIME))
                        return -EPERM;
+               if (!ccs_capable(CCS_SYS_SETTIME))
+                       return -EPERM;
                if (!(txc->modes & ADJ_NANO))
                        delta.tv_nsec *= 1000;
                result = timekeeping_inject_offset(&delta);
--- linux-3.6.11.orig/net/ipv4/raw.c
+++ linux-3.6.11/net/ipv4/raw.c
@@ -704,6 +704,10 @@ static int raw_recvmsg(struct kiocb *ioc
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out;
+       }
 
        copied = skb->len;
        if (len < copied) {
--- linux-3.6.11.orig/net/ipv4/udp.c
+++ linux-3.6.11/net/ipv4/udp.c
@@ -1193,6 +1193,10 @@ try_again:
                                  &peeked, &off, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out;
+       }
 
        ulen = skb->len - sizeof(struct udphdr);
        copied = len;
--- linux-3.6.11.orig/net/ipv6/raw.c
+++ linux-3.6.11/net/ipv6/raw.c
@@ -472,6 +472,10 @@ static int rawv6_recvmsg(struct kiocb *i
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out;
+       }
 
        copied = skb->len;
        if (copied > len) {
--- linux-3.6.11.orig/net/ipv6/udp.c
+++ linux-3.6.11/net/ipv6/udp.c
@@ -363,6 +363,10 @@ try_again:
                                  &peeked, &off, &err);
        if (!skb)
                goto out;
+       if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out;
+       }
 
        ulen = skb->len - sizeof(struct udphdr);
        copied = len;
--- linux-3.6.11.orig/net/socket.c
+++ linux-3.6.11/net/socket.c
@@ -1551,6 +1551,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        if (err < 0)
                goto out_fd;
 
+       if (ccs_socket_post_accept_permission(sock, newsock)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out_fd;
+       }
        if (upeer_sockaddr) {
                if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
                                          &len, 2) < 0) {
--- linux-3.6.11.orig/net/unix/af_unix.c
+++ linux-3.6.11/net/unix/af_unix.c
@@ -1806,6 +1806,10 @@ static int unix_dgram_recvmsg(struct kio
        wake_up_interruptible_sync_poll(&u->peer_wait,
                                        POLLOUT | POLLWRNORM | POLLWRBAND);
 
+       if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
+               err = -EAGAIN; /* Hope less harmful than -EPERM. */
+               goto out_unlock;
+       }
        if (msg->msg_name)
                unix_copy_addr(msg, skb->sk);
 
--- linux-3.6.11.orig/security/Kconfig
+++ linux-3.6.11/security/Kconfig
@@ -167,5 +167,7 @@ config DEFAULT_SECURITY
        default "yama" if DEFAULT_SECURITY_YAMA
        default "" if DEFAULT_SECURITY_DAC
 
+source security/ccsecurity/Kconfig
+
 endmenu
 
--- linux-3.6.11.orig/security/Makefile
+++ linux-3.6.11/security/Makefile
@@ -28,3 +28,6 @@ obj-$(CONFIG_CGROUP_DEVICE)           += device_c
 # Object integrity file lists
 subdir-$(CONFIG_INTEGRITY)             += integrity
 obj-$(CONFIG_INTEGRITY)                        += integrity/built-in.o
+
+subdir-$(CONFIG_CCSECURITY)            += ccsecurity
+obj-$(CONFIG_CCSECURITY)               += ccsecurity/built-in.o
--- linux-3.6.11.orig/security/security.c
+++ linux-3.6.11/security/security.c
@@ -190,7 +190,10 @@ int security_syslog(int type)
 
 int security_settime(const struct timespec *ts, const struct timezone *tz)
 {
-       return security_ops->settime(ts, tz);
+       int error = security_ops->settime(ts, tz);
+       if (!error && !ccs_capable(CCS_SYS_SETTIME))
+               error = -EPERM;
+       return error;
 }
 
 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
@@ -267,17 +270,27 @@ int security_sb_statfs(struct dentry *de
 int security_sb_mount(char *dev_name, struct path *path,
                        char *type, unsigned long flags, void *data)
 {
-       return security_ops->sb_mount(dev_name, path, type, flags, data);
+       int error = security_ops->sb_mount(dev_name, path, type, flags, data);
+       if (!error)
+               error = ccs_mount_permission(dev_name, path, type, flags,
+                                            data);
+       return error;
 }
 
 int security_sb_umount(struct vfsmount *mnt, int flags)
 {
-       return security_ops->sb_umount(mnt, flags);
+       int error = security_ops->sb_umount(mnt, flags);
+       if (!error)
+               error = ccs_umount_permission(mnt, flags);
+       return error;
 }
 
 int security_sb_pivotroot(struct path *old_path, struct path *new_path)
 {
-       return security_ops->sb_pivotroot(old_path, new_path);
+       int error = security_ops->sb_pivotroot(old_path, new_path);
+       if (!error)
+               error = ccs_pivot_root_permission(old_path, new_path);
+       return error;
 }
 
 int security_sb_set_mnt_opts(struct super_block *sb,
@@ -364,86 +377,132 @@ EXPORT_SYMBOL(security_old_inode_init_se
 int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
                        unsigned int dev)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))
                return 0;
-       return security_ops->path_mknod(dir, dentry, mode, dev);
+       error = security_ops->path_mknod(dir, dentry, mode, dev);
+       if (!error)
+               error = ccs_mknod_permission(dentry, dir->mnt, mode, dev);
+       return error;
 }
 EXPORT_SYMBOL(security_path_mknod);
 
 int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))
                return 0;
-       return security_ops->path_mkdir(dir, dentry, mode);
+       error = security_ops->path_mkdir(dir, dentry, mode);
+       if (!error)
+               error = ccs_mkdir_permission(dentry, dir->mnt, mode);
+       return error;
 }
 EXPORT_SYMBOL(security_path_mkdir);
 
 int security_path_rmdir(struct path *dir, struct dentry *dentry)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))
                return 0;
-       return security_ops->path_rmdir(dir, dentry);
+       error = security_ops->path_rmdir(dir, dentry);
+       if (!error)
+               error = ccs_rmdir_permission(dentry, dir->mnt);
+       return error;
 }
 
 int security_path_unlink(struct path *dir, struct dentry *dentry)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))
                return 0;
-       return security_ops->path_unlink(dir, dentry);
+       error = security_ops->path_unlink(dir, dentry);
+       if (!error)
+               error = ccs_unlink_permission(dentry, dir->mnt);
+       return error;
 }
 EXPORT_SYMBOL(security_path_unlink);
 
 int security_path_symlink(struct path *dir, struct dentry *dentry,
                          const char *old_name)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))
                return 0;
-       return security_ops->path_symlink(dir, dentry, old_name);
+       error = security_ops->path_symlink(dir, dentry, old_name);
+       if (!error)
+               error = ccs_symlink_permission(dentry, dir->mnt, old_name);
+       return error;
 }
 
 int security_path_link(struct dentry *old_dentry, struct path *new_dir,
                       struct dentry *new_dentry)
 {
+       int error;
        if (unlikely(IS_PRIVATE(old_dentry->d_inode)))
                return 0;
-       return security_ops->path_link(old_dentry, new_dir, new_dentry);
+       error = security_ops->path_link(old_dentry, new_dir, new_dentry);
+       if (!error)
+               error = ccs_link_permission(old_dentry, new_dentry,
+                                           new_dir->mnt);
+       return error;
 }
 
 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                         struct path *new_dir, struct dentry *new_dentry)
 {
+       int error;
        if (unlikely(IS_PRIVATE(old_dentry->d_inode) ||
                     (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode))))
                return 0;
-       return security_ops->path_rename(old_dir, old_dentry, new_dir,
-                                        new_dentry);
+       error = security_ops->path_rename(old_dir, old_dentry, new_dir,
+                                         new_dentry);
+       if (!error)
+               error = ccs_rename_permission(old_dentry, new_dentry,
+                                             new_dir->mnt);
+       return error;
 }
 EXPORT_SYMBOL(security_path_rename);
 
 int security_path_truncate(struct path *path)
 {
+       int error;
        if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
                return 0;
-       return security_ops->path_truncate(path);
+       error = security_ops->path_truncate(path);
+       if (!error)
+               error = ccs_truncate_permission(path->dentry, path->mnt);
+       return error;
 }
 
 int security_path_chmod(struct path *path, umode_t mode)
 {
+       int error;
        if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
                return 0;
-       return security_ops->path_chmod(path, mode);
+       error = security_ops->path_chmod(path, mode);
+       if (!error)
+               error = ccs_chmod_permission(path->dentry, path->mnt, mode);
+       return error;
 }
 
 int security_path_chown(struct path *path, uid_t uid, gid_t gid)
 {
+       int error;
        if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
                return 0;
-       return security_ops->path_chown(path, uid, gid);
+       error = security_ops->path_chown(path, uid, gid);
+       if (!error)
+               error = ccs_chown_permission(path->dentry, path->mnt, uid,
+                                            gid);
+       return error;
 }
 
 int security_path_chroot(struct path *path)
 {
-       return security_ops->path_chroot(path);
+       int error = security_ops->path_chroot(path);
+       if (!error)
+               error = ccs_chroot_permission(path);
+       return error;
 }
 #endif
 
@@ -546,9 +605,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
 
 int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
 {
+       int error;
        if (unlikely(IS_PRIVATE(dentry->d_inode)))
                return 0;
-       return security_ops->inode_getattr(mnt, dentry);
+       error = security_ops->inode_getattr(mnt, dentry);
+       if (!error)
+               error = ccs_getattr_permission(mnt, dentry);
+       return error;
 }
 
 int security_inode_setxattr(struct dentry *dentry, const char *name,
@@ -658,7 +721,10 @@ void security_file_free(struct file *fil
 
 int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       return security_ops->file_ioctl(file, cmd, arg);
+       int error = security_ops->file_ioctl(file, cmd, arg);
+       if (!error)
+               error = ccs_ioctl_permission(file, cmd, arg);
+       return error;
 }
 
 static inline unsigned long mmap_prot(struct file *file, unsigned long prot)
@@ -724,7 +790,10 @@ int security_file_lock(struct file *file
 
 int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       return security_ops->file_fcntl(file, cmd, arg);
+       int error = security_ops->file_fcntl(file, cmd, arg);
+       if (!error)
+               error = ccs_fcntl_permission(file, cmd, arg);
+       return error;
 }
 
 int security_file_set_fowner(struct file *file)
@@ -748,6 +817,8 @@ int security_file_open(struct file *file
        int ret;
 
        ret = security_ops->file_open(file, cred);
+       if (!ret)
+               ret = ccs_open_permission(file);
        if (ret)
                return ret;
 
@@ -1062,7 +1133,10 @@ EXPORT_SYMBOL(security_unix_may_send);
 
 int security_socket_create(int family, int type, int protocol, int kern)
 {
-       return security_ops->socket_create(family, type, protocol, kern);
+       int error = security_ops->socket_create(family, type, protocol, kern);
+       if (!error)
+               error = ccs_socket_create_permission(family, type, protocol);
+       return error;
 }
 
 int security_socket_post_create(struct socket *sock, int family,
@@ -1074,17 +1148,26 @@ int security_socket_post_create(struct s
 
 int security_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)
 {
-       return security_ops->socket_bind(sock, address, addrlen);
+       int error = security_ops->socket_bind(sock, address, addrlen);
+       if (!error)
+               error = ccs_socket_bind_permission(sock, address, addrlen);
+       return error;
 }
 
 int security_socket_connect(struct socket *sock, struct sockaddr *address, int addrlen)
 {
-       return security_ops->socket_connect(sock, address, addrlen);
+       int error = security_ops->socket_connect(sock, address, addrlen);
+       if (!error)
+               error = ccs_socket_connect_permission(sock, address, addrlen);
+       return error;
 }
 
 int security_socket_listen(struct socket *sock, int backlog)
 {
-       return security_ops->socket_listen(sock, backlog);
+       int error = security_ops->socket_listen(sock, backlog);
+       if (!error)
+               error = ccs_socket_listen_permission(sock);
+       return error;
 }
 
 int security_socket_accept(struct socket *sock, struct socket *newsock)
@@ -1094,7 +1177,10 @@ int security_socket_accept(struct socket
 
 int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size)
 {
-       return security_ops->socket_sendmsg(sock, msg, size);
+       int error = security_ops->socket_sendmsg(sock, msg, size);
+       if (!error)
+               error = ccs_socket_sendmsg_permission(sock, msg, size);
+       return error;
 }
 
 int security_socket_recvmsg(struct socket *sock, struct msghdr *msg,