aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2018-09-12 20:04:24 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2018-09-12 20:19:17 +0100
commit066c9b0b93e2586f8bc30ea6005e475eede1c4be (patch)
tree862897985177fa028bcf2b010d5f5fd87001e0c2
parent78ddb154ba4fd08dbf1ceeb94ffd00634171c9f1 (diff)
downloadlinux-cip-066c9b0b93e2586f8bc30ea6005e475eede1c4be.tar.gz
Revert "Smack: Mark inode instant in smack_task_to_inode"
This reverts commit 091cb7dec89b1bbd4989a30f5ae9ab93248d2a93, which was commit 7b4e88434c4e7982fb053c49657e1c8bbb8692d9 upstream. The issue it is supposed to address was only introduced in Linux 4.18. Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
-rw-r--r--security/smack/smack_lsm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index c73361859d112e..735a1a9386d64d 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2260,7 +2260,6 @@ 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;
}
/*