Smack: Handle labels consistently in untrusted mounts

The SMACK64, SMACK64EXEC, and SMACK64MMAP labels are all handled
differently in untrusted mounts. This is confusing and
potentically problematic. Change this to handle them all the same
way that SMACK64 is currently handled; that is, read the label
from disk and check it at use time. For SMACK64 and SMACK64MMAP
access is denied if the label does not match smk_root. To be
consistent with suid, a SMACK64EXEC label which does not match
smk_root will still allow execution of the file but will not run
with the label supplied in the xattr.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index a799b7af11afcdadb0c2b1dafa853b6c878dab1f..b75634dbf53ba24f4e39be091f9474f697ccb0d9 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -919,6 +919,7 @@ static int smack_bprm_set_creds(struct linux_binprm *bprm)
        struct inode *inode = file_inode(bprm->file);
        struct task_smack *bsp = bprm->cred->security;
        struct inode_smack *isp;
+       struct superblock_smack *sbsp;
        int rc;
 
        if (bprm->cred_prepared)
@@ -928,6 +929,11 @@ static int smack_bprm_set_creds(struct linux_binprm *bprm)
        if (isp->smk_task == NULL || isp->smk_task == bsp->smk_task)
                return 0;
 
+       sbsp = inode->i_sb->s_security;
+       if ((sbsp->smk_flags & SMK_SB_UNTRUSTED) &&
+           isp->smk_task != sbsp->smk_root)
+               return 0;
+
        if (bprm->unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
                struct task_struct *tracer;
                rc = 0;
@@ -1725,6 +1731,7 @@ static int smack_mmap_file(struct file *file,
        struct task_smack *tsp;
        struct smack_known *okp;
        struct inode_smack *isp;
+       struct superblock_smack *sbsp;
        int may;
        int mmay;
        int tmay;
@@ -1736,6 +1743,10 @@ static int smack_mmap_file(struct file *file,
        isp = file_inode(file)->i_security;
        if (isp->smk_mmap == NULL)
                return 0;
+       sbsp = file_inode(file)->i_sb->s_security;
+       if (sbsp->smk_flags & SMK_SB_UNTRUSTED &&
+           isp->smk_mmap != sbsp->smk_root)
+               return -EACCES;
        mkp = isp->smk_mmap;
 
        tsp = current_security();
@@ -3546,16 +3557,14 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                        if (rc >= 0)
                                transflag = SMK_INODE_TRANSMUTE;
                }
-               if (!(sbsp->smk_flags & SMK_SB_UNTRUSTED)) {
-                       /*
-                        * Don't let the exec or mmap label be "*" or "@".
-                        */
-                       skp = smk_fetch(XATTR_NAME_SMACKEXEC, inode, dp);
-                       if (IS_ERR(skp) || skp == &smack_known_star ||
-                           skp == &smack_known_web)
-                               skp = NULL;
-                       isp->smk_task = skp;
-               }
+               /*
+                * Don't let the exec or mmap label be "*" or "@".
+                */
+               skp = smk_fetch(XATTR_NAME_SMACKEXEC, inode, dp);
+               if (IS_ERR(skp) || skp == &smack_known_star ||
+                   skp == &smack_known_web)
+                       skp = NULL;
+               isp->smk_task = skp;
 
                skp = smk_fetch(XATTR_NAME_SMACKMMAP, inode, dp);
                if (IS_ERR(skp) || skp == &smack_known_star ||