Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / security / smack / smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 37fdd5416a64d54bd183f999cb90d86f1d53f91e..8d85435a45d7f6f5ee3a81fb4e134cb0023cc6a4 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1465,7 +1465,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
  *
  * Returns the size of the attribute or an error code
  */
-static int smack_inode_getsecurity(const struct inode *inode,
+static int smack_inode_getsecurity(struct inode *inode,
                                   const char *name, void **buffer,
                                   bool alloc)
 {
@@ -1536,7 +1536,7 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer,
  * @inode: inode to extract the info from
  * @secid: where result will be saved
  */
-static void smack_inode_getsecid(const struct inode *inode, u32 *secid)
+static void smack_inode_getsecid(struct inode *inode, u32 *secid)
 {
        struct inode_smack *isp = inode->i_security;
 
@@ -1858,12 +1858,34 @@ static int smack_file_receive(struct file *file)
        int may = 0;
        struct smk_audit_info ad;
        struct inode *inode = file_inode(file);
+       struct socket *sock;
+       struct task_smack *tsp;
+       struct socket_smack *ssp;
 
        if (unlikely(IS_PRIVATE(inode)))
                return 0;
 
        smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_PATH);
        smk_ad_setfield_u_fs_path(&ad, file->f_path);
+
+       if (S_ISSOCK(inode->i_mode)) {
+               sock = SOCKET_I(inode);
+               ssp = sock->sk->sk_security;
+               tsp = current_security();
+               /*
+                * If the receiving process can't write to the
+                * passed socket or if the passed socket can't
+                * write to the receiving process don't accept
+                * the passed socket.
+                */
+               rc = smk_access(tsp->smk_task, ssp->smk_out, MAY_WRITE, &ad);
+               rc = smk_bu_file(file, may, rc);
+               if (rc < 0)
+                       return rc;
+               rc = smk_access(ssp->smk_in, tsp->smk_task, MAY_WRITE, &ad);
+               rc = smk_bu_file(file, may, rc);
+               return rc;
+       }
        /*
         * This code relies on bitmasks.
         */
@@ -3756,7 +3778,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
        if (sip == NULL)
                return 0;
 
-       switch (sip->sin_family) {
+       switch (sock->sk->sk_family) {
        case AF_INET:
                rc = smack_netlabel_send(sock->sk, sip);
                break;