summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-29 15:39:57 +0100
committerMark Brown <broonie@kernel.org>2018-08-29 15:39:57 +0100
commit3a9cbd70c74f3a4afc78f898f7f95519ef5c5477 (patch)
tree47db1e11546b79db7e66ba40812de67223091de8 /security
parent7057964870d64963153ec86558ecaa6ac742a929 (diff)
parent577189c37a844243359afce1c3c94418259fe696 (diff)
Merge tag 'v4.4.153' into linux-linaro-lsk-v4.4
This is the 4.4.153 stable release
Diffstat (limited to 'security')
-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 735a1a9386d6..c73361859d11 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2260,6 +2260,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;
}
/*