aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorRoman Kubiak <r.kubiak@samsung.com>2015-10-05 12:27:16 +0200
committerCasey Schaufler <casey@schaufler-ca.com>2015-10-09 15:13:41 -0700
commit8da4aba5bf9869f58d2a6bb30daaf54b2fa72569 (patch)
treeff412b663cff7760540410a90e33712241bdabd3 /security
parentd21b7b049c0c1753a10c1d01606f42bad0e0f733 (diff)
downloadlinux-linaro-stable-8da4aba5bf9869f58d2a6bb30daaf54b2fa72569.tar.gz
Smack: pipefs fix in smack_d_instantiate
This fix writes the task label when smack_d_instantiate is called, before the label of the superblock was written on the pipe's inode. Signed-off-by: Roman Kubiak <r.kubiak@samsung.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 2c0579d0da20..c2d66ca1127a 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3354,6 +3354,9 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
*/
isp->smk_inode = smk_of_current();
break;
+ case PIPEFS_MAGIC:
+ isp->smk_inode = smk_of_current();
+ break;
default:
isp->smk_inode = sbsp->smk_root;
break;