aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJosé Bollo <jobol@nonadev.net>2016-01-12 21:23:40 +0100
committerCasey Schaufler <casey@schaufler-ca.com>2016-02-16 09:56:35 -0800
commit8012495e177bbf67eba8915e266a6f897bedbd53 (patch)
treee4bacef53ca7675d7d5a567d43e3806ef65fd064 /security
parent491a0b08d38e7f0961a1850d43d0dea02f918d66 (diff)
downloadleg-kernel-8012495e177bbf67eba8915e266a6f897bedbd53.tar.gz
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>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 2775d658b767..11f79013ae1f 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1442,9 +1442,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 = d_backing_inode(dentry)->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;