diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-26 12:03:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-26 12:03:29 +0800 |
| commit | bded05d18ce5d06d169e1a097d4477fcbdae57ff (patch) | |
| tree | c50310f76cc635d38773e5a00afee6a6353fddbc /security | |
| parent | f08537113440b60725c7bbfbae0702caeddad655 (diff) | |
| parent | be8cec38166830bd968b13389b8b22da6913f439 (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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index ed5a9c110b3a..9ce9d5003dcc 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -203,10 +203,11 @@ int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, cause = "missing-hash"; status = INTEGRITY_NOLABEL; - if (opened & FILE_CREATED) { + if (opened & FILE_CREATED) iint->flags |= IMA_NEW_FILE; + if ((iint->flags & IMA_NEW_FILE) && + !(iint->flags & IMA_DIGSIG_REQUIRED)) status = INTEGRITY_PASS; - } goto out; } |