summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorCasey Schaufler <casey@schaufler-ca.com>2018-06-22 10:54:45 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-24 13:09:04 +0200
commit4545cfb006b72c017b75eba3bb71deb34e290e0d (patch)
tree8616d7c030ae1265042bfe5acf117350053004e1 /security/smack
parentf8e7a1bd752a73a59238389eb395eaecc636c8e9 (diff)
downloadlinux-stable-4545cfb006b72c017b75eba3bb71deb34e290e0d.tar.gz
linux-stable-4545cfb006b72c017b75eba3bb71deb34e290e0d.tar.bz2
linux-stable-4545cfb006b72c017b75eba3bb71deb34e290e0d.zip
Smack: Mark inode instant in smack_task_to_inode
[ Upstream commit 7b4e88434c4e7982fb053c49657e1c8bbb8692d9 ] Smack: Mark inode instant in smack_task_to_inode /proc clean-up in commit 1bbc55131e59bd099fdc568d3aa0b42634dbd188 resulted in smack_task_to_inode() being called before smack_d_instantiate. This resulted in the smk_inode value being ignored, even while present for files in /proc/self. Marking the inode as instant here fixes that. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <james.morris@microsoft.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/smack')
-rw-r--r--security/smack/smack_lsm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 286171a16ed2..fdf01bfd1b07 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2281,6 +2281,7 @@ static void smack_task_to_inode(struct task_struct *p, struct inode *inode)
struct smack_known *skp = smk_of_task_struct(p);
isp->smk_inode = skp;
+ isp->smk_flags |= SMK_INODE_INSTANT;
}
/*