Merge branch 'master' into next

Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

diff --combined include/linux/sched.h
index 94990a8,0f1ea4a..5c7ce13
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1198,6 -1198,7 +1198,7 @@@ struct task_struct 
         * a short time
         */
        unsigned char fpu_counter;
+       s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
  #ifdef CONFIG_BLK_DEV_IO_TRACE
        unsigned int btrace_seq;
  #endif
@@@ -2076,7 -2077,7 +2077,7 @@@ static inline unsigned long wait_task_i
  #define for_each_process(p) \
        for (p = &init_task ; (p = next_task(p)) != &init_task ; )
  
 -extern bool is_single_threaded(struct task_struct *);
 +extern bool current_is_single_threaded(void);
  
  /*
   * Careful: do_each_thread/while_each_thread is a double loop so

diff --combined security/selinux/hooks.c
index 254b798,8d8b69c..6d0b1cc
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -1285,6 -1285,8 +1285,8 @@@ static int inode_doinit_with_dentry(str
                rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,
                                           context, len);
                if (rc == -ERANGE) {
+                       kfree(context);
+ 
                        /* Need a larger buffer.  Query for the right size. */
                        rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,
                                                   NULL, 0);
@@@ -1292,7 -1294,6 +1294,6 @@@
                                dput(dentry);
                                goto out_unlock;
                        }
-                       kfree(context);
                        len = rc;
                        context = kmalloc(len+1, GFP_NOFS);
                        if (!context) {
@@@ -1478,14 -1479,14 +1479,14 @@@ static int task_has_capability(struct t
                               const struct cred *cred,
                               int cap, int audit)
  {
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        struct av_decision avd;
        u16 sclass;
        u32 sid = cred_sid(cred);
        u32 av = CAP_TO_MASK(cap);
        int rc;
  
 -      AVC_AUDIT_DATA_INIT(&ad, CAP);
 +      COMMON_AUDIT_DATA_INIT(&ad, CAP);
        ad.tsk = tsk;
        ad.u.cap = cap;
  
@@@ -1524,10 -1525,10 +1525,10 @@@ static int task_has_system(struct task_
  static int inode_has_perm(const struct cred *cred,
                          struct inode *inode,
                          u32 perms,
 -                        struct avc_audit_data *adp)
 +                        struct common_audit_data *adp)
  {
        struct inode_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid;
  
        if (unlikely(IS_PRIVATE(inode)))
@@@ -1538,7 -1539,7 +1539,7 @@@
  
        if (!adp) {
                adp = &ad;
 -              AVC_AUDIT_DATA_INIT(&ad, FS);
 +              COMMON_AUDIT_DATA_INIT(&ad, FS);
                ad.u.fs.inode = inode;
        }
  
@@@ -1554,9 -1555,9 +1555,9 @@@ static inline int dentry_has_perm(cons
                                  u32 av)
  {
        struct inode *inode = dentry->d_inode;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.mnt = mnt;
        ad.u.fs.path.dentry = dentry;
        return inode_has_perm(cred, inode, av, &ad);
@@@ -1576,11 -1577,11 +1577,11 @@@ static int file_has_perm(const struct c
  {
        struct file_security_struct *fsec = file->f_security;
        struct inode *inode = file->f_path.dentry->d_inode;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = cred_sid(cred);
        int rc;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path = file->f_path;
  
        if (sid != fsec->sid) {
@@@ -1611,7 -1612,7 +1612,7 @@@ static int may_create(struct inode *dir
        struct inode_security_struct *dsec;
        struct superblock_security_struct *sbsec;
        u32 sid, newsid;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        int rc;
  
        dsec = dir->i_security;
@@@ -1620,7 -1621,7 +1621,7 @@@
        sid = tsec->sid;
        newsid = tsec->create_sid;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.dentry = dentry;
  
        rc = avc_has_perm(sid, dsec->sid, SECCLASS_DIR,
@@@ -1664,7 -1665,7 +1665,7 @@@ static int may_link(struct inode *dir
  
  {
        struct inode_security_struct *dsec, *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        u32 av;
        int rc;
@@@ -1672,7 -1673,7 +1673,7 @@@
        dsec = dir->i_security;
        isec = dentry->d_inode->i_security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.dentry = dentry;
  
        av = DIR__SEARCH;
@@@ -1707,7 -1708,7 +1708,7 @@@ static inline int may_rename(struct ino
                             struct dentry *new_dentry)
  {
        struct inode_security_struct *old_dsec, *new_dsec, *old_isec, *new_isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        u32 av;
        int old_is_dir, new_is_dir;
@@@ -1718,7 -1719,7 +1719,7 @@@
        old_is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
        new_dsec = new_dir->i_security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
  
        ad.u.fs.path.dentry = old_dentry;
        rc = avc_has_perm(sid, old_dsec->sid, SECCLASS_DIR,
@@@ -1760,7 -1761,7 +1761,7 @@@
  static int superblock_has_perm(const struct cred *cred,
                               struct super_block *sb,
                               u32 perms,
 -                             struct avc_audit_data *ad)
 +                             struct common_audit_data *ad)
  {
        struct superblock_security_struct *sbsec;
        u32 sid = cred_sid(cred);
@@@ -1854,12 -1855,12 +1855,12 @@@ static inline u32 open_file_to_av(struc
  
  /* Hook functions begin here. */
  
 -static int selinux_ptrace_may_access(struct task_struct *child,
 +static int selinux_ptrace_access_check(struct task_struct *child,
                                     unsigned int mode)
  {
        int rc;
  
 -      rc = cap_ptrace_may_access(child, mode);
 +      rc = cap_ptrace_access_check(child, mode);
        if (rc)
                return rc;
  
@@@ -2100,7 -2101,7 +2101,7 @@@ static int selinux_bprm_set_creds(struc
        const struct task_security_struct *old_tsec;
        struct task_security_struct *new_tsec;
        struct inode_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        struct inode *inode = bprm->file->f_path.dentry->d_inode;
        int rc;
  
@@@ -2138,7 -2139,7 +2139,7 @@@
                        return rc;
        }
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path = bprm->file->f_path;
  
        if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
@@@ -2231,7 -2232,7 +2232,7 @@@ extern struct dentry *selinux_null
  static inline void flush_unauthorized_files(const struct cred *cred,
                                            struct files_struct *files)
  {
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        struct file *file, *devnull = NULL;
        struct tty_struct *tty;
        struct fdtable *fdt;
@@@ -2265,7 -2266,7 +2266,7 @@@
  
        /* Revalidate access to inherited open files. */
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
  
        spin_lock(&files->file_lock);
        for (;;) {
@@@ -2514,7 -2515,7 +2515,7 @@@ out
  static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data)
  {
        const struct cred *cred = current_cred();
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        int rc;
  
        rc = superblock_doinit(sb, data);
@@@ -2525,7 -2526,7 +2526,7 @@@
        if (flags & MS_KERNMOUNT)
                return 0;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.dentry = sb->s_root;
        return superblock_has_perm(cred, sb, FILESYSTEM__MOUNT, &ad);
  }
@@@ -2533,9 -2534,9 +2534,9 @@@
  static int selinux_sb_statfs(struct dentry *dentry)
  {
        const struct cred *cred = current_cred();
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.dentry = dentry->d_sb->s_root;
        return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad);
  }
@@@ -2755,7 -2756,7 +2756,7 @@@ static int selinux_inode_setxattr(struc
        struct inode *inode = dentry->d_inode;
        struct inode_security_struct *isec = inode->i_security;
        struct superblock_security_struct *sbsec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 newsid, sid = current_sid();
        int rc = 0;
  
@@@ -2769,7 -2770,7 +2770,7 @@@
        if (!is_owner_or_cap(inode))
                return -EPERM;
  
 -      AVC_AUDIT_DATA_INIT(&ad, FS);
 +      COMMON_AUDIT_DATA_INIT(&ad, FS);
        ad.u.fs.path.dentry = dentry;
  
        rc = avc_has_perm(sid, isec->sid, isec->sclass,
@@@ -2938,6 -2939,11 +2939,6 @@@ static int selinux_revalidate_file_perm
        const struct cred *cred = current_cred();
        struct inode *inode = file->f_path.dentry->d_inode;
  
 -      if (!mask) {
 -              /* No permission to check.  Existence test. */
 -              return 0;
 -      }
 -
        /* file_mask_to_av won't add FILE__WRITE if MAY_APPEND is set */
        if ((file->f_flags & O_APPEND) && (mask & MAY_WRITE))
                mask |= MAY_APPEND;
@@@ -2948,20 -2954,10 +2949,20 @@@
  
  static int selinux_file_permission(struct file *file, int mask)
  {
 +      struct inode *inode = file->f_path.dentry->d_inode;
 +      struct file_security_struct *fsec = file->f_security;
 +      struct inode_security_struct *isec = inode->i_security;
 +      u32 sid = current_sid();
 +
        if (!mask)
                /* No permission to check.  Existence test. */
                return 0;
  
 +      if (sid == fsec->sid && fsec->isid == isec->sid &&
 +          fsec->pseqno == avc_policy_seqno())
 +              /* No change since dentry_open check. */
 +              return 0;
 +
        return selinux_revalidate_file_permission(file, mask);
  }
  
@@@ -3296,11 -3292,6 +3297,11 @@@ static int selinux_kernel_create_files_
        return 0;
  }
  
 +static int selinux_kernel_module_request(void)
 +{
 +      return task_has_system(current, SYSTEM__MODULE_REQUEST);
 +}
 +
  static int selinux_task_setpgid(struct task_struct *p, pid_t pgid)
  {
        return current_has_perm(p, PROCESS__SETPGID);
@@@ -3418,7 -3409,7 +3419,7 @@@ static void selinux_task_to_inode(struc
  
  /* Returns error only if unable to parse addresses */
  static int selinux_parse_skb_ipv4(struct sk_buff *skb,
 -                      struct avc_audit_data *ad, u8 *proto)
 +                      struct common_audit_data *ad, u8 *proto)
  {
        int offset, ihlen, ret = -EINVAL;
        struct iphdr _iph, *ih;
@@@ -3499,7 -3490,7 +3500,7 @@@ out
  
  /* Returns error only if unable to parse addresses */
  static int selinux_parse_skb_ipv6(struct sk_buff *skb,
 -                      struct avc_audit_data *ad, u8 *proto)
 +                      struct common_audit_data *ad, u8 *proto)
  {
        u8 nexthdr;
        int ret = -EINVAL, offset;
@@@ -3570,7 -3561,7 +3571,7 @@@ out
  
  #endif /* IPV6 */
  
 -static int selinux_parse_skb(struct sk_buff *skb, struct avc_audit_data *ad,
 +static int selinux_parse_skb(struct sk_buff *skb, struct common_audit_data *ad,
                             char **_addrp, int src, u8 *proto)
  {
        char *addrp;
@@@ -3652,7 -3643,7 +3653,7 @@@ static int socket_has_perm(struct task_
                           u32 perms)
  {
        struct inode_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid;
        int err = 0;
  
@@@ -3662,7 -3653,7 +3663,7 @@@
                goto out;
        sid = task_sid(task);
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.sk = sock->sk;
        err = avc_has_perm(sid, isec->sid, isec->sclass, perms, &ad);
  
@@@ -3749,7 -3740,7 +3750,7 @@@ static int selinux_socket_bind(struct s
        if (family == PF_INET || family == PF_INET6) {
                char *addrp;
                struct inode_security_struct *isec;
 -              struct avc_audit_data ad;
 +              struct common_audit_data ad;
                struct sockaddr_in *addr4 = NULL;
                struct sockaddr_in6 *addr6 = NULL;
                unsigned short snum;
@@@ -3778,7 -3769,7 +3779,7 @@@
                                                      snum, &sid);
                                if (err)
                                        goto out;
 -                              AVC_AUDIT_DATA_INIT(&ad, NET);
 +                              COMMON_AUDIT_DATA_INIT(&ad, NET);
                                ad.u.net.sport = htons(snum);
                                ad.u.net.family = family;
                                err = avc_has_perm(isec->sid, sid,
@@@ -3811,7 -3802,7 +3812,7 @@@
                if (err)
                        goto out;
  
 -              AVC_AUDIT_DATA_INIT(&ad, NET);
 +              COMMON_AUDIT_DATA_INIT(&ad, NET);
                ad.u.net.sport = htons(snum);
                ad.u.net.family = family;
  
@@@ -3845,7 -3836,7 +3846,7 @@@ static int selinux_socket_connect(struc
        isec = SOCK_INODE(sock)->i_security;
        if (isec->sclass == SECCLASS_TCP_SOCKET ||
            isec->sclass == SECCLASS_DCCP_SOCKET) {
 -              struct avc_audit_data ad;
 +              struct common_audit_data ad;
                struct sockaddr_in *addr4 = NULL;
                struct sockaddr_in6 *addr6 = NULL;
                unsigned short snum;
@@@ -3870,7 -3861,7 +3871,7 @@@
                perm = (isec->sclass == SECCLASS_TCP_SOCKET) ?
                       TCP_SOCKET__NAME_CONNECT : DCCP_SOCKET__NAME_CONNECT;
  
 -              AVC_AUDIT_DATA_INIT(&ad, NET);
 +              COMMON_AUDIT_DATA_INIT(&ad, NET);
                ad.u.net.dport = htons(snum);
                ad.u.net.family = sk->sk_family;
                err = avc_has_perm(isec->sid, sid, isec->sclass, perm, &ad);
@@@ -3960,13 -3951,13 +3961,13 @@@ static int selinux_socket_unix_stream_c
        struct sk_security_struct *ssec;
        struct inode_security_struct *isec;
        struct inode_security_struct *other_isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        int err;
  
        isec = SOCK_INODE(sock)->i_security;
        other_isec = SOCK_INODE(other)->i_security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.sk = other->sk;
  
        err = avc_has_perm(isec->sid, other_isec->sid,
@@@ -3992,13 -3983,13 +3993,13 @@@ static int selinux_socket_unix_may_send
  {
        struct inode_security_struct *isec;
        struct inode_security_struct *other_isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        int err;
  
        isec = SOCK_INODE(sock)->i_security;
        other_isec = SOCK_INODE(other)->i_security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.sk = other->sk;
  
        err = avc_has_perm(isec->sid, other_isec->sid,
@@@ -4011,7 -4002,7 +4012,7 @@@
  
  static int selinux_inet_sys_rcv_skb(int ifindex, char *addrp, u16 family,
                                    u32 peer_sid,
 -                                  struct avc_audit_data *ad)
 +                                  struct common_audit_data *ad)
  {
        int err;
        u32 if_sid;
@@@ -4039,10 -4030,10 +4040,10 @@@ static int selinux_sock_rcv_skb_compat(
        struct sk_security_struct *sksec = sk->sk_security;
        u32 peer_sid;
        u32 sk_sid = sksec->sid;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        char *addrp;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.netif = skb->iif;
        ad.u.net.family = family;
        err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
@@@ -4080,7 -4071,7 +4081,7 @@@ static int selinux_socket_sock_rcv_skb(
        struct sk_security_struct *sksec = sk->sk_security;
        u16 family = sk->sk_family;
        u32 sk_sid = sksec->sid;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        char *addrp;
        u8 secmark_active;
        u8 peerlbl_active;
@@@ -4104,7 -4095,7 +4105,7 @@@
        if (!secmark_active && !peerlbl_active)
                return 0;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.netif = skb->iif;
        ad.u.net.family = family;
        err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
@@@ -4362,7 -4353,7 +4363,7 @@@ static unsigned int selinux_ip_forward(
        int err;
        char *addrp;
        u32 peer_sid;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u8 secmark_active;
        u8 netlbl_active;
        u8 peerlbl_active;
@@@ -4379,7 -4370,7 +4380,7 @@@
        if (selinux_skb_peerlbl_sid(skb, family, &peer_sid) != 0)
                return NF_DROP;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.netif = ifindex;
        ad.u.net.family = family;
        if (selinux_parse_skb(skb, &ad, &addrp, 1, NULL) != 0)
@@@ -4467,7 -4458,7 +4468,7 @@@ static unsigned int selinux_ip_postrout
  {
        struct sock *sk = skb->sk;
        struct sk_security_struct *sksec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        char *addrp;
        u8 proto;
  
@@@ -4475,7 -4466,7 +4476,7 @@@
                return NF_ACCEPT;
        sksec = sk->sk_security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.netif = ifindex;
        ad.u.net.family = family;
        if (selinux_parse_skb(skb, &ad, &addrp, 0, &proto))
@@@ -4499,7 -4490,7 +4500,7 @@@ static unsigned int selinux_ip_postrout
        u32 secmark_perm;
        u32 peer_sid;
        struct sock *sk;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        char *addrp;
        u8 secmark_active;
        u8 peerlbl_active;
@@@ -4558,7 -4549,7 +4559,7 @@@
                secmark_perm = PACKET__SEND;
        }
  
 -      AVC_AUDIT_DATA_INIT(&ad, NET);
 +      COMMON_AUDIT_DATA_INIT(&ad, NET);
        ad.u.net.netif = ifindex;
        ad.u.net.family = family;
        if (selinux_parse_skb(skb, &ad, &addrp, 0, NULL))
@@@ -4628,13 -4619,13 +4629,13 @@@ static int selinux_netlink_send(struct 
  static int selinux_netlink_recv(struct sk_buff *skb, int capability)
  {
        int err;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
  
        err = cap_netlink_recv(skb, capability);
        if (err)
                return err;
  
 -      AVC_AUDIT_DATA_INIT(&ad, CAP);
 +      COMMON_AUDIT_DATA_INIT(&ad, CAP);
        ad.u.cap = capability;
  
        return avc_has_perm(NETLINK_CB(skb).sid, NETLINK_CB(skb).sid,
@@@ -4693,12 -4684,12 +4694,12 @@@ static int ipc_has_perm(struct kern_ipc
                        u32 perms)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
  
        isec = ipc_perms->security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = ipc_perms->key;
  
        return avc_has_perm(sid, isec->sid, isec->sclass, perms, &ad);
@@@ -4718,7 -4709,7 +4719,7 @@@ static void selinux_msg_msg_free_securi
  static int selinux_msg_queue_alloc_security(struct msg_queue *msq)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        int rc;
  
@@@ -4728,7 -4719,7 +4729,7 @@@
  
        isec = msq->q_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = msq->q_perm.key;
  
        rc = avc_has_perm(sid, isec->sid, SECCLASS_MSGQ,
@@@ -4748,12 -4739,12 +4749,12 @@@ static void selinux_msg_queue_free_secu
  static int selinux_msg_queue_associate(struct msg_queue *msq, int msqflg)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
  
        isec = msq->q_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = msq->q_perm.key;
  
        return avc_has_perm(sid, isec->sid, SECCLASS_MSGQ,
@@@ -4792,7 -4783,7 +4793,7 @@@ static int selinux_msg_queue_msgsnd(str
  {
        struct ipc_security_struct *isec;
        struct msg_security_struct *msec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        int rc;
  
@@@ -4813,7 -4804,7 +4814,7 @@@
                        return rc;
        }
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = msq->q_perm.key;
  
        /* Can this process write to the queue? */
@@@ -4837,14 -4828,14 +4838,14 @@@ static int selinux_msg_queue_msgrcv(str
  {
        struct ipc_security_struct *isec;
        struct msg_security_struct *msec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = task_sid(target);
        int rc;
  
        isec = msq->q_perm.security;
        msec = msg->security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = msq->q_perm.key;
  
        rc = avc_has_perm(sid, isec->sid,
@@@ -4859,7 -4850,7 +4860,7 @@@
  static int selinux_shm_alloc_security(struct shmid_kernel *shp)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        int rc;
  
@@@ -4869,7 -4860,7 +4870,7 @@@
  
        isec = shp->shm_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = shp->shm_perm.key;
  
        rc = avc_has_perm(sid, isec->sid, SECCLASS_SHM,
@@@ -4889,12 -4880,12 +4890,12 @@@ static void selinux_shm_free_security(s
  static int selinux_shm_associate(struct shmid_kernel *shp, int shmflg)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
  
        isec = shp->shm_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = shp->shm_perm.key;
  
        return avc_has_perm(sid, isec->sid, SECCLASS_SHM,
@@@ -4951,7 -4942,7 +4952,7 @@@ static int selinux_shm_shmat(struct shm
  static int selinux_sem_alloc_security(struct sem_array *sma)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
        int rc;
  
@@@ -4961,7 -4952,7 +4962,7 @@@
  
        isec = sma->sem_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = sma->sem_perm.key;
  
        rc = avc_has_perm(sid, isec->sid, SECCLASS_SEM,
@@@ -4981,12 -4972,12 +4982,12 @@@ static void selinux_sem_free_security(s
  static int selinux_sem_associate(struct sem_array *sma, int semflg)
  {
        struct ipc_security_struct *isec;
 -      struct avc_audit_data ad;
 +      struct common_audit_data ad;
        u32 sid = current_sid();
  
        isec = sma->sem_perm.security;
  
 -      AVC_AUDIT_DATA_INIT(&ad, IPC);
 +      COMMON_AUDIT_DATA_INIT(&ad, IPC);
        ad.u.ipc_id = sma->sem_perm.key;
  
        return avc_has_perm(sid, isec->sid, SECCLASS_SEM,
@@@ -5204,7 -5195,7 +5205,7 @@@ static int selinux_setprocattr(struct t
  
                /* Only allow single threaded processes to change context */
                error = -EPERM;
 -              if (!is_single_threaded(p)) {
 +              if (!current_is_single_threaded()) {
                        error = security_bounded_transition(tsec->sid, sid);
                        if (error)
                                goto abort_change;
@@@ -5332,7 -5323,7 +5333,7 @@@ static int selinux_key_getsecurity(stru
  static struct security_operations selinux_ops = {
        .name =                         "selinux",
  
 -      .ptrace_may_access =            selinux_ptrace_may_access,
 +      .ptrace_access_check =          selinux_ptrace_access_check,
        .ptrace_traceme =               selinux_ptrace_traceme,
        .capget =                       selinux_capget,
        .capset =                       selinux_capset,
@@@ -5409,7 -5400,6 +5410,7 @@@
        .cred_prepare =                 selinux_cred_prepare,
        .kernel_act_as =                selinux_kernel_act_as,
        .kernel_create_files_as =       selinux_kernel_create_files_as,
 +      .kernel_module_request =        selinux_kernel_module_request,
        .task_setpgid =                 selinux_task_setpgid,
        .task_getpgid =                 selinux_task_getpgid,
        .task_getsid =                  selinux_task_getsid,
@@@ -5701,9 -5691,6 +5702,9 @@@ int selinux_disable(void
        selinux_disabled = 1;
        selinux_enabled = 0;
  
 +      /* Try to destroy the avc node cache */
 +      avc_disable();
 +
        /* Reset security_ops to the secondary module, dummy or capability. */
        security_ops = secondary_ops;