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

Pull security subsystem updates from James Morris:

 - EVM gains support for loading an x509 cert from the kernel
   (EVM_LOAD_X509), into the EVM trusted kernel keyring.

 - Smack implements 'file receive' process-based permission checking for
   sockets, rather than just depending on inode checks.

 - Misc enhancments for TPM & TPM2.

 - Cleanups and bugfixes for SELinux, Keys, and IMA.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (41 commits)
  selinux: Inode label revalidation performance fix
  KEYS: refcount bug fix
  ima: ima_write_policy() limit locking
  IMA: policy can be updated zero times
  selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()
  selinux: export validatetrans decisions
  gfs2: Invalid security labels of inodes when they go invalid
  selinux: Revalidate invalid inode security labels
  security: Add hook to invalidate inode security labels
  selinux: Add accessor functions for inode->i_security
  security: Make inode argument of inode_getsecid non-const
  security: Make inode argument of inode_getsecurity non-const
  selinux: Remove unused variable in selinux_inode_init_security
  keys, trusted: seal with a TPM2 authorization policy
  keys, trusted: select hash algorithm for TPM2 chips
  keys, trusted: fix: *do not* allow duplicate key options
  tpm_ibmvtpm: properly handle interrupted packet receptions
  tpm_tis: Tighten IRQ auto-probing
  tpm_tis: Refactor the interrupt setup
  tpm_tis: Get rid of the duplicate IRQ probing code
  ...

1 files changed, 25 insertions, 3 deletions

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 37fdd5416a64..8d85435a45d7 100644
--- 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;