BACKPORT: smack: fix cache of access labels

Before this commit, removing the access property of
a file, aka, the extended attribute security.SMACK64
was not effictive until the cache had been cleaned.

This patch fixes that problem.

Signed-off-by: José Bollo <jobol@nonadev.net>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry-picked from upstream 8012495e177bbf67eba8915e266a6f897bedbd53)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index f0bb48a00757c51b4df0c505df690a505962722b..cb424ba1ac6fe881f2c425899aa873bb0dabb4df 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1444,9 +1444,13 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
         * Don't do anything special for these.
         *      XATTR_NAME_SMACKIPIN
         *      XATTR_NAME_SMACKIPOUT
-        *      XATTR_NAME_SMACKEXEC
         */
-       if (strcmp(name, XATTR_NAME_SMACK) == 0)
+       if (strcmp(name, XATTR_NAME_SMACK) == 0) {
+               struct super_block *sbp = dentry->d_inode->i_sb;
+               struct superblock_smack *sbsp = sbp->s_security;
+
+               isp->smk_inode = sbsp->smk_default;
+       } else if (strcmp(name, XATTR_NAME_SMACKEXEC) == 0)
                isp->smk_task = NULL;
        else if (strcmp(name, XATTR_NAME_SMACKMMAP) == 0)
                isp->smk_mmap = NULL;