summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-11-26 12:03:21 +0800
committerAlex Shi <alex.shi@linaro.org>2017-11-26 12:03:21 +0800
commit00236b01de65d53e3cde74900c7b0be059abcf6b (patch)
treebd68b5dfc786421ab6ebe76f9f63b589ba600da9 /security
parentc6c917192dccaef616c63f1d6acd0af45bf5cb84 (diff)
parentd8e6d09cfa7260b12501ce94ca35977be998d4a7 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_appraise.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 9ce9d5003dcc..19014293f927 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -297,6 +297,9 @@ void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file)
if (iint->flags & IMA_DIGSIG)
return;
+ if (iint->ima_file_status != INTEGRITY_PASS)
+ return;
+
rc = ima_collect_measurement(iint, file, NULL, NULL);
if (rc < 0)
return;