1 files changed, 246 insertions, 108 deletions

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index ccb71a044a1a..533bf3255d7f 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3,12 +3,14 @@
  *
  *  This file contains the smack hook function implementations.
  *
- *  Author:
+ *  Authors:
  *      Casey Schaufler <casey@schaufler-ca.com>
+ *      Jarkko Sakkinen <ext-jarkko.2.sakkinen@nokia.com>
  *
  *  Copyright (C) 2007 Casey Schaufler <casey@schaufler-ca.com>
  *  Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
  *                Paul Moore <paul.moore@hp.com>
+ *  Copyright (C) 2010 Nokia Corporation
  *
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License version 2,
@@ -35,6 +37,9 @@
 
 #define task_security(task)     (task_cred_xxx((task), security))
 
+#define TRANS_TRUE      "TRUE"
+#define TRANS_TRUE_SIZE 4
+
 /**
  * smk_fetch - Fetch the smack label from a file.
  * @ip: a pointer to the inode
@@ -43,7 +48,7 @@
  * Returns a pointer to the master list entry for the Smack label
  * or NULL if there was no label to fetch.
  */
-static char *smk_fetch(struct inode *ip, struct dentry *dp)
+static char *smk_fetch(const char *name, struct inode *ip, struct dentry *dp)
 {
         int rc;
         char in[SMK_LABELLEN];
@@ -51,7 +56,7 @@ static char *smk_fetch(struct inode *ip, struct dentry *dp)
         if (ip->i_op->getxattr == NULL)
                 return NULL;
 
-        rc = ip->i_op->getxattr(dp, XATTR_NAME_SMACK, in, SMK_LABELLEN);
+        rc = ip->i_op->getxattr(dp, name, in, SMK_LABELLEN);
         if (rc < 0)
                 return NULL;
 
@@ -103,8 +108,8 @@ static int smack_ptrace_access_check(struct task_struct *ctp, unsigned int mode)
         if (rc != 0)
                 return rc;
 
-        sp = current_security();
-        tsp = task_security(ctp);
+        sp = smk_of_current();
+        tsp = smk_of_task(task_security(ctp));
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
         smk_ad_setfield_u_tsk(&ad, ctp);
 
@@ -138,8 +143,8 @@ static int smack_ptrace_traceme(struct task_struct *ptp)
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
         smk_ad_setfield_u_tsk(&ad, ptp);
 
-        sp = current_security();
-        tsp = task_security(ptp);
+        sp = smk_of_current();
+        tsp = smk_of_task(task_security(ptp));
         /* we won't log here, because rc can be overriden */
         rc = smk_access(tsp, sp, MAY_READWRITE, NULL);
         if (rc != 0 && has_capability(ptp, CAP_MAC_OVERRIDE))
@@ -160,7 +165,7 @@ static int smack_ptrace_traceme(struct task_struct *ptp)
 static int smack_syslog(int typefrom_file)
 {
         int rc = 0;
-        char *sp = current_security();
+        char *sp = smk_of_current();
 
         if (capable(CAP_MAC_OVERRIDE))
                 return 0;
@@ -391,6 +396,40 @@ static int smack_sb_umount(struct vfsmount *mnt, int flags)
 }
 
 /*
+ * BPRM hooks
+ */
+
+static int smack_bprm_set_creds(struct linux_binprm *bprm)
+{
+        struct task_smack *tsp = bprm->cred->security;
+        struct inode_smack *isp;
+        struct dentry *dp;
+        int rc;
+
+        rc = cap_bprm_set_creds(bprm);
+        if (rc != 0)
+                return rc;
+
+        if (bprm->cred_prepared)
+                return 0;
+
+        if (bprm->file == NULL || bprm->file->f_dentry == NULL)
+                return 0;
+
+        dp = bprm->file->f_dentry;
+
+        if (dp->d_inode == NULL)
+                return 0;
+
+        isp = dp->d_inode->i_security;
+
+        if (isp->smk_task != NULL)
+                tsp->smk_task = isp->smk_task;
+
+        return 0;
+}
+
+/*
  * Inode hooks
  */
 
@@ -402,7 +441,7 @@ static int smack_sb_umount(struct vfsmount *mnt, int flags)
  */
 static int smack_inode_alloc_security(struct inode *inode)
 {
-        inode->i_security = new_inode_smack(current_security());
+        inode->i_security = new_inode_smack(smk_of_current());
         if (inode->i_security == NULL)
                 return -ENOMEM;
         return 0;
@@ -434,6 +473,8 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
                                      char **name, void **value, size_t *len)
 {
         char *isp = smk_of_inode(inode);
+        char *dsp = smk_of_inode(dir);
+        u32 may;
 
         if (name) {
                 *name = kstrdup(XATTR_SMACK_SUFFIX, GFP_KERNEL);
@@ -442,6 +483,16 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
         }
 
         if (value) {
+                may = smk_access_entry(smk_of_current(), dsp);
+
+                /*
+                 * If the access rule allows transmutation and
+                 * the directory requests transmutation then
+                 * by all means transmute.
+                 */
+                if (((may & MAY_TRANSMUTE) != 0) && smk_inode_transmutable(dir))
+                        isp = dsp;
+
                 *value = kstrdup(isp, GFP_KERNEL);
                 if (*value == NULL)
                         return -ENOMEM;
@@ -664,7 +715,8 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name,
 
         if (strcmp(name, XATTR_NAME_SMACK) == 0 ||
             strcmp(name, XATTR_NAME_SMACKIPIN) == 0 ||
-            strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
+            strcmp(name, XATTR_NAME_SMACKIPOUT) == 0 ||
+            strcmp(name, XATTR_NAME_SMACKEXEC) == 0) {
                 if (!capable(CAP_MAC_ADMIN))
                         rc = -EPERM;
                 /*
@@ -674,6 +726,12 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name,
                 if (size == 0 || size >= SMK_LABELLEN ||
                     smk_import(value, size) == NULL)
                         rc = -EINVAL;
+        } else if (strcmp(name, XATTR_NAME_SMACKTRANSMUTE) == 0) {
+                if (!capable(CAP_MAC_ADMIN))
+                        rc = -EPERM;
+                if (size != TRANS_TRUE_SIZE ||
+                    strncmp(value, TRANS_TRUE, TRANS_TRUE_SIZE) != 0)
+                        rc = -EINVAL;
         } else
                 rc = cap_inode_setxattr(dentry, name, value, size, flags);
 
@@ -700,26 +758,23 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name,
 static void smack_inode_post_setxattr(struct dentry *dentry, const char *name,
                                       const void *value, size_t size, int flags)
 {
-        struct inode_smack *isp;
         char *nsp;
+        struct inode_smack *isp = dentry->d_inode->i_security;
 
-        /*
-         * Not SMACK
-         */
-        if (strcmp(name, XATTR_NAME_SMACK))
-                return;
-
-        isp = dentry->d_inode->i_security;
-
-        /*
-         * No locking is done here. This is a pointer
-         * assignment.
-         */
-        nsp = smk_import(value, size);
-        if (nsp != NULL)
-                isp->smk_inode = nsp;
-        else
-                isp->smk_inode = smack_known_invalid.smk_known;
+        if (strcmp(name, XATTR_NAME_SMACK) == 0) {
+                nsp = smk_import(value, size);
+                if (nsp != NULL)
+                        isp->smk_inode = nsp;
+                else
+                        isp->smk_inode = smack_known_invalid.smk_known;
+        } else if (strcmp(name, XATTR_NAME_SMACKEXEC) == 0) {
+                nsp = smk_import(value, size);
+                if (nsp != NULL)
+                        isp->smk_task = nsp;
+                else
+                        isp->smk_task = smack_known_invalid.smk_known;
+        } else if (strcmp(name, XATTR_NAME_SMACKTRANSMUTE) == 0)
+                isp->smk_flags |= SMK_INODE_TRANSMUTE;
 
         return;
 }
@@ -752,12 +807,15 @@ static int smack_inode_getxattr(struct dentry *dentry, const char *name)
  */
 static int smack_inode_removexattr(struct dentry *dentry, const char *name)
 {
+        struct inode_smack *isp;
         struct smk_audit_info ad;
         int rc = 0;
 
         if (strcmp(name, XATTR_NAME_SMACK) == 0 ||
             strcmp(name, XATTR_NAME_SMACKIPIN) == 0 ||
-            strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
+            strcmp(name, XATTR_NAME_SMACKIPOUT) == 0 ||
+            strcmp(name, XATTR_NAME_SMACKEXEC) == 0 ||
+            strcmp(name, XATTR_NAME_SMACKTRANSMUTE) == 0) {
                 if (!capable(CAP_MAC_ADMIN))
                         rc = -EPERM;
         } else
@@ -768,6 +826,11 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
         if (rc == 0)
                 rc = smk_curacc(smk_of_inode(dentry->d_inode), MAY_WRITE, &ad);
 
+        if (rc == 0) {
+                isp = dentry->d_inode->i_security;
+                isp->smk_task = NULL;
+        }
+
         return rc;
 }
 
@@ -895,7 +958,7 @@ static int smack_file_permission(struct file *file, int mask)
  */
 static int smack_file_alloc_security(struct file *file)
 {
-        file->f_security = current_security();
+        file->f_security = smk_of_current();
         return 0;
 }
 
@@ -1005,7 +1068,7 @@ static int smack_file_fcntl(struct file *file, unsigned int cmd,
  */
 static int smack_file_set_fowner(struct file *file)
 {
-        file->f_security = current_security();
+        file->f_security = smk_of_current();
         return 0;
 }
 
@@ -1025,7 +1088,7 @@ static int smack_file_send_sigiotask(struct task_struct *tsk,
 {
         struct file *file;
         int rc;
-        char *tsp = tsk->cred->security;
+        char *tsp = smk_of_task(tsk->cred->security);
         struct smk_audit_info ad;
 
         /*
@@ -1082,7 +1145,9 @@ static int smack_file_receive(struct file *file)
  */
 static int smack_cred_alloc_blank(struct cred *cred, gfp_t gfp)
 {
-        cred->security = NULL;
+        cred->security = kzalloc(sizeof(struct task_smack), gfp);
+        if (cred->security == NULL)
+                return -ENOMEM;
         return 0;
 }
 
@@ -1097,7 +1162,7 @@ static int smack_cred_alloc_blank(struct cred *cred, gfp_t gfp)
  */
 static void smack_cred_free(struct cred *cred)
 {
-        cred->security = NULL;
+        kfree(cred->security);
 }
 
 /**
@@ -1111,7 +1176,16 @@ static void smack_cred_free(struct cred *cred)
 static int smack_cred_prepare(struct cred *new, const struct cred *old,
                               gfp_t gfp)
 {
-        new->security = old->security;
+        struct task_smack *old_tsp = old->security;
+        struct task_smack *new_tsp;
+
+        new_tsp = kzalloc(sizeof(struct task_smack), gfp);
+        if (new_tsp == NULL)
+                return -ENOMEM;
+
+        new_tsp->smk_task = old_tsp->smk_task;
+        new_tsp->smk_forked = old_tsp->smk_task;
+        new->security = new_tsp;
         return 0;
 }
 
@@ -1124,7 +1198,11 @@ static int smack_cred_prepare(struct cred *new, const struct cred *old,
  */
 static void smack_cred_transfer(struct cred *new, const struct cred *old)
 {
-        new->security = old->security;
+        struct task_smack *old_tsp = old->security;
+        struct task_smack *new_tsp = new->security;
+
+        new_tsp->smk_task = old_tsp->smk_task;
+        new_tsp->smk_forked = old_tsp->smk_task;
 }
 
 /**
@@ -1136,12 +1214,13 @@ static void smack_cred_transfer(struct cred *new, const struct cred *old)
  */
 static int smack_kernel_act_as(struct cred *new, u32 secid)
 {
+        struct task_smack *new_tsp = new->security;
         char *smack = smack_from_secid(secid);
 
         if (smack == NULL)
                 return -EINVAL;
 
-        new->security = smack;
+        new_tsp->smk_task = smack;
         return 0;
 }
 
@@ -1157,8 +1236,10 @@ static int smack_kernel_create_files_as(struct cred *new,
                                         struct inode *inode)
 {
         struct inode_smack *isp = inode->i_security;
+        struct task_smack *tsp = new->security;
 
-        new->security = isp->smk_inode;
+        tsp->smk_forked = isp->smk_inode;
+        tsp->smk_task = isp->smk_inode;
         return 0;
 }
 
@@ -1175,7 +1256,7 @@ static int smk_curacc_on_task(struct task_struct *p, int access)
 
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
         smk_ad_setfield_u_tsk(&ad, p);
-        return smk_curacc(task_security(p), access, &ad);
+        return smk_curacc(smk_of_task(task_security(p)), access, &ad);
 }
 
 /**
@@ -1221,7 +1302,7 @@ static int smack_task_getsid(struct task_struct *p)
  */
 static void smack_task_getsecid(struct task_struct *p, u32 *secid)
 {
-        *secid = smack_to_secid(task_security(p));
+        *secid = smack_to_secid(smk_of_task(task_security(p)));
 }
 
 /**
@@ -1333,14 +1414,15 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
          * can write the receiver.
          */
         if (secid == 0)
-                return smk_curacc(task_security(p), MAY_WRITE, &ad);
+                return smk_curacc(smk_of_task(task_security(p)), MAY_WRITE,
+                                  &ad);
         /*
          * If the secid isn't 0 we're dealing with some USB IO
          * specific behavior. This is not clean. For one thing
          * we can't take privilege into account.
          */
-        return smk_access(smack_from_secid(secid), task_security(p),
-                          MAY_WRITE, &ad);
+        return smk_access(smack_from_secid(secid),
+                          smk_of_task(task_security(p)), MAY_WRITE, &ad);
 }
 
 /**
@@ -1352,12 +1434,12 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
 static int smack_task_wait(struct task_struct *p)
 {
         struct smk_audit_info ad;
-        char *sp = current_security();
-        char *tsp = task_security(p);
+        char *sp = smk_of_current();
+        char *tsp = smk_of_forked(task_security(p));
         int rc;
 
         /* we don't log here, we can be overriden */
-        rc = smk_access(sp, tsp, MAY_WRITE, NULL);
+        rc = smk_access(tsp, sp, MAY_WRITE, NULL);
         if (rc == 0)
                 goto out_log;
 
@@ -1378,7 +1460,7 @@ static int smack_task_wait(struct task_struct *p)
  out_log:
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
         smk_ad_setfield_u_tsk(&ad, p);
-        smack_log(sp, tsp, MAY_WRITE, rc, &ad);
+        smack_log(tsp, sp, MAY_WRITE, rc, &ad);
         return rc;
 }
 
@@ -1392,7 +1474,7 @@ static int smack_task_wait(struct task_struct *p)
 static void smack_task_to_inode(struct task_struct *p, struct inode *inode)
 {
         struct inode_smack *isp = inode->i_security;
-        isp->smk_inode = task_security(p);
+        isp->smk_inode = smk_of_task(task_security(p));
 }
 
 /*
@@ -1411,7 +1493,7 @@ static void smack_task_to_inode(struct task_struct *p, struct inode *inode)
  */
 static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
 {
-        char *csp = current_security();
+        char *csp = smk_of_current();
         struct socket_smack *ssp;
 
         ssp = kzalloc(sizeof(struct socket_smack), gfp_flags);
@@ -1667,10 +1749,13 @@ static int smack_inode_setsecurity(struct inode *inode, const char *name,
                 ssp->smk_in = sp;
         else if (strcmp(name, XATTR_SMACK_IPOUT) == 0) {
                 ssp->smk_out = sp;
-                rc = smack_netlabel(sock->sk, SMACK_CIPSO_SOCKET);
-                if (rc != 0)
-                        printk(KERN_WARNING "Smack: \"%s\" netlbl error %d.\n",
-                               __func__, -rc);
+                if (sock->sk->sk_family != PF_UNIX) {
+                        rc = smack_netlabel(sock->sk, SMACK_CIPSO_SOCKET);
+                        if (rc != 0)
+                                printk(KERN_WARNING
+                                        "Smack: \"%s\" netlbl error %d.\n",
+                                        __func__, -rc);
+                }
         } else
                 return -EOPNOTSUPP;
 
@@ -1749,7 +1834,7 @@ static int smack_flags_to_may(int flags)
  */
 static int smack_msg_msg_alloc_security(struct msg_msg *msg)
 {
-        msg->security = current_security();
+        msg->security = smk_of_current();
         return 0;
 }
 
@@ -1785,7 +1870,7 @@ static int smack_shm_alloc_security(struct shmid_kernel *shp)
 {
         struct kern_ipc_perm *isp = &shp->shm_perm;
 
-        isp->security = current_security();
+        isp->security = smk_of_current();
         return 0;
 }
 
@@ -1908,7 +1993,7 @@ static int smack_sem_alloc_security(struct sem_array *sma)
 {
         struct kern_ipc_perm *isp = &sma->sem_perm;
 
-        isp->security = current_security();
+        isp->security = smk_of_current();
         return 0;
 }
 
@@ -2026,7 +2111,7 @@ static int smack_msg_queue_alloc_security(struct msg_queue *msq)
 {
         struct kern_ipc_perm *kisp = &msq->q_perm;
 
-        kisp->security = current_security();
+        kisp->security = smk_of_current();
         return 0;
 }
 
@@ -2198,9 +2283,11 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
         struct super_block *sbp;
         struct superblock_smack *sbsp;
         struct inode_smack *isp;
-        char *csp = current_security();
+        char *csp = smk_of_current();
         char *fetched;
         char *final;
+        char trattr[TRANS_TRUE_SIZE];
+        int transflag = 0;
         struct dentry *dp;
 
         if (inode == NULL)
@@ -2267,9 +2354,10 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                 break;
         case SOCKFS_MAGIC:
                 /*
-                 * Casey says sockets get the smack of the task.
+                 * Socket access is controlled by the socket
+                 * structures associated with the task involved.
                  */
-                final = csp;
+                final = smack_known_star.smk_known;
                 break;
         case PROC_SUPER_MAGIC:
                 /*
@@ -2296,7 +2384,16 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                 /*
                  * This isn't an understood special case.
                  * Get the value from the xattr.
-                 *
+                 */
+
+                /*
+                 * UNIX domain sockets use lower level socket data.
+                 */
+                if (S_ISSOCK(inode->i_mode)) {
+                        final = smack_known_star.smk_known;
+                        break;
+                }
+                /*
                  * No xattr support means, alas, no SMACK label.
                  * Use the aforeapplied default.
                  * It would be curious if the label of the task
@@ -2308,9 +2405,21 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                  * Get the dentry for xattr.
                  */
                 dp = dget(opt_dentry);
-                fetched = smk_fetch(inode, dp);
-                if (fetched != NULL)
+                fetched = smk_fetch(XATTR_NAME_SMACK, inode, dp);
+                if (fetched != NULL) {
                         final = fetched;
+                        if (S_ISDIR(inode->i_mode)) {
+                                trattr[0] = '\0';
+                                inode->i_op->getxattr(dp,
+                                        XATTR_NAME_SMACKTRANSMUTE,
+                                        trattr, TRANS_TRUE_SIZE);
+                                if (strncmp(trattr, TRANS_TRUE,
+                                            TRANS_TRUE_SIZE) == 0)
+                                        transflag = SMK_INODE_TRANSMUTE;
+                        }
+                }
+                isp->smk_task = smk_fetch(XATTR_NAME_SMACKEXEC, inode, dp);
+
                 dput(dp);
                 break;
         }
@@ -2320,7 +2429,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
         else
                 isp->smk_inode = final;
 
-        isp->smk_flags |= SMK_INODE_INSTANT;
+        isp->smk_flags |= (SMK_INODE_INSTANT | transflag);
 
 unlockandout:
         mutex_unlock(&isp->smk_lock);
@@ -2345,7 +2454,7 @@ static int smack_getprocattr(struct task_struct *p, char *name, char **value)
         if (strcmp(name, "current") != 0)
                 return -EINVAL;
 
-        cp = kstrdup(task_security(p), GFP_KERNEL);
+        cp = kstrdup(smk_of_task(task_security(p)), GFP_KERNEL);
         if (cp == NULL)
                 return -ENOMEM;
 
@@ -2369,6 +2478,8 @@ static int smack_getprocattr(struct task_struct *p, char *name, char **value)
 static int smack_setprocattr(struct task_struct *p, char *name,
                              void *value, size_t size)
 {
+        struct task_smack *tsp;
+        struct task_smack *oldtsp;
         struct cred *new;
         char *newsmack;
 
@@ -2398,10 +2509,18 @@ static int smack_setprocattr(struct task_struct *p, char *name,
         if (newsmack == smack_known_web.smk_known)
                 return -EPERM;
 
+        oldtsp = p->cred->security;
         new = prepare_creds();
         if (new == NULL)
                 return -ENOMEM;
-        new->security = newsmack;
+        tsp = kzalloc(sizeof(struct task_smack), GFP_KERNEL);
+        if (tsp == NULL) {
+                kfree(new);
+                return -ENOMEM;
+        }
+        tsp->smk_task = newsmack;
+        tsp->smk_forked = oldtsp->smk_forked;
+        new->security = tsp;
         commit_creds(new);
         return size;
 }
@@ -2418,14 +2537,18 @@ static int smack_setprocattr(struct task_struct *p, char *name,
 static int smack_unix_stream_connect(struct sock *sock,
                                      struct sock *other, struct sock *newsk)
 {
-        struct inode *sp = SOCK_INODE(sock->sk_socket);
-        struct inode *op = SOCK_INODE(other->sk_socket);
+        struct socket_smack *ssp = sock->sk_security;
+        struct socket_smack *osp = other->sk_security;
         struct smk_audit_info ad;
+        int rc = 0;
 
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         smk_ad_setfield_u_net_sk(&ad, other);
-        return smk_access(smk_of_inode(sp), smk_of_inode(op),
-                                 MAY_READWRITE, &ad);
+
+        if (!capable(CAP_MAC_OVERRIDE))
+                rc = smk_access(ssp->smk_out, osp->smk_in, MAY_WRITE, &ad);
+
+        return rc;
 }
 
 /**
@@ -2438,13 +2561,18 @@ static int smack_unix_stream_connect(struct sock *sock,
  */
 static int smack_unix_may_send(struct socket *sock, struct socket *other)
 {
-        struct inode *sp = SOCK_INODE(sock);
-        struct inode *op = SOCK_INODE(other);
+        struct socket_smack *ssp = sock->sk->sk_security;
+        struct socket_smack *osp = other->sk->sk_security;
         struct smk_audit_info ad;
+        int rc = 0;
 
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         smk_ad_setfield_u_net_sk(&ad, other->sk);
-        return smk_access(smk_of_inode(sp), smk_of_inode(op), MAY_WRITE, &ad);
+
+        if (!capable(CAP_MAC_OVERRIDE))
+                rc = smk_access(ssp->smk_out, osp->smk_in, MAY_WRITE, &ad);
+
+        return rc;
 }
 
 /**
@@ -2629,7 +2757,7 @@ static int smack_socket_getpeersec_stream(struct socket *sock,
 
 /**
  * smack_socket_getpeersec_dgram - pull in packet label
- * @sock: the socket
+ * @sock: the peer socket
  * @skb: packet data
  * @secid: pointer to where to put the secid of the packet
  *
@@ -2640,41 +2768,39 @@ static int smack_socket_getpeersec_dgram(struct socket *sock,
 
 {
         struct netlbl_lsm_secattr secattr;
-        struct sock *sk;
+        struct socket_smack *sp;
         char smack[SMK_LABELLEN];
-        int family = PF_INET;
-        u32 s;
+        int family = PF_UNSPEC;
+        u32 s = 0;      /* 0 is the invalid secid */
         int rc;
 
-        /*
-         * Only works for families with packets.
-         */
-        if (sock != NULL) {
-                sk = sock->sk;
-                if (sk->sk_family != PF_INET && sk->sk_family != PF_INET6)
-                        return 0;
-                family = sk->sk_family;
+        if (skb != NULL) {
+                if (skb->protocol == htons(ETH_P_IP))
+                        family = PF_INET;
+                else if (skb->protocol == htons(ETH_P_IPV6))
+                        family = PF_INET6;
         }
-        /*
-         * Translate what netlabel gave us.
-         */
-        netlbl_secattr_init(&secattr);
-        rc = netlbl_skbuff_getattr(skb, family, &secattr);
-        if (rc == 0)
-                smack_from_secattr(&secattr, smack);
-        netlbl_secattr_destroy(&secattr);
+        if (family == PF_UNSPEC && sock != NULL)
+                family = sock->sk->sk_family;
 
-        /*
-         * Give up if we couldn't get anything
-         */
-        if (rc != 0)
-                return rc;
-
-        s = smack_to_secid(smack);
+        if (family == PF_UNIX) {
+                sp = sock->sk->sk_security;
+                s = smack_to_secid(sp->smk_out);
+        } else if (family == PF_INET || family == PF_INET6) {
+                /*
+                 * Translate what netlabel gave us.
+                 */
+                netlbl_secattr_init(&secattr);
+                rc = netlbl_skbuff_getattr(skb, family, &secattr);
+                if (rc == 0) {
+                        smack_from_secattr(&secattr, smack);
+                        s = smack_to_secid(smack);
+                }
+                netlbl_secattr_destroy(&secattr);
+        }
+        *secid = s;
         if (s == 0)
                 return -EINVAL;
-
-        *secid = s;
         return 0;
 }
 
@@ -2695,7 +2821,7 @@ static void smack_sock_graft(struct sock *sk, struct socket *parent)
                 return;
 
         ssp = sk->sk_security;
-        ssp->smk_in = ssp->smk_out = current_security();
+        ssp->smk_in = ssp->smk_out = smk_of_current();
         /* cssp->smk_packet is already set in smack_inet_csk_clone() */
 }
 
@@ -2816,7 +2942,7 @@ static void smack_inet_csk_clone(struct sock *sk,
 static int smack_key_alloc(struct key *key, const struct cred *cred,
                            unsigned long flags)
 {
-        key->security = cred->security;
+        key->security = smk_of_task(cred->security);
         return 0;
 }
 
@@ -2845,6 +2971,7 @@ static int smack_key_permission(key_ref_t key_ref,
 {
         struct key *keyp;
         struct smk_audit_info ad;
+        char *tsp = smk_of_task(cred->security);
 
         keyp = key_ref_to_ptr(key_ref);
         if (keyp == NULL)
@@ -2858,14 +2985,14 @@ static int smack_key_permission(key_ref_t key_ref,
         /*
          * This should not occur
          */
-        if (cred->security == NULL)
+        if (tsp == NULL)
                 return -EACCES;
 #ifdef CONFIG_AUDIT
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_KEY);
         ad.a.u.key_struct.key = keyp->serial;
         ad.a.u.key_struct.key_desc = keyp->description;
 #endif
-        return smk_access(cred->security, keyp->security,
+        return smk_access(tsp, keyp->security,
                                  MAY_READWRITE, &ad);
 }
 #endif /* CONFIG_KEYS */
@@ -3067,6 +3194,8 @@ struct security_operations smack_ops = {
         .sb_mount =                     smack_sb_mount,
         .sb_umount =                    smack_sb_umount,
 
+        .bprm_set_creds =               smack_bprm_set_creds,
+
         .inode_alloc_security =         smack_inode_alloc_security,
         .inode_free_security =          smack_inode_free_security,
         .inode_init_security =          smack_inode_init_security,
@@ -3203,9 +3332,16 @@ static __init void init_smack_know_list(void)
 static __init int smack_init(void)
 {
         struct cred *cred;
+        struct task_smack *tsp;
 
-        if (!security_module_enable(&smack_ops))
+        tsp = kzalloc(sizeof(struct task_smack), GFP_KERNEL);
+        if (tsp == NULL)
+                return -ENOMEM;
+
+        if (!security_module_enable(&smack_ops)) {
+                kfree(tsp);
                 return 0;
+        }
 
         printk(KERN_INFO "Smack:  Initializing.\n");
 
@@ -3213,7 +3349,9 @@ static __init int smack_init(void)
          * Set the security state for the initial task.
          */
         cred = (struct cred *) current->cred;
-        cred->security = &smack_known_floor.smk_known;
+        tsp->smk_forked = smack_known_floor.smk_known;
+        tsp->smk_task = smack_known_floor.smk_known;
+        cred->security = tsp;
 
         /* initialize the smack_know_list */
         init_smack_know_list();