diff options
author | James Morris <james.l.morris@oracle.com> | 2016-02-26 15:06:41 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2016-02-26 15:06:41 +1100 |
commit | 481873d06f2bf2ad732450a3a5fa5b8c2a07ef88 (patch) | |
tree | e2d16457d7902795073e4e4ad479798242a0ef80 /security/integrity/iint.c | |
parent | 602094428090ea17321afcb5edc572544b7ee368 (diff) | |
parent | 95ee08fa373b9ede1059c2f384cfeafe10dcd6bb (diff) | |
download | linux-stable-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.tar.gz linux-stable-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.tar.bz2 linux-stable-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/iint.c')
-rw-r--r-- | security/integrity/iint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 8f1ab37f2897..345b75997e4c 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -77,7 +77,7 @@ static void iint_free(struct integrity_iint_cache *iint) iint->ima_file_status = INTEGRITY_UNKNOWN; iint->ima_mmap_status = INTEGRITY_UNKNOWN; iint->ima_bprm_status = INTEGRITY_UNKNOWN; - iint->ima_module_status = INTEGRITY_UNKNOWN; + iint->ima_read_status = INTEGRITY_UNKNOWN; iint->evm_status = INTEGRITY_UNKNOWN; kmem_cache_free(iint_cache, iint); } @@ -157,7 +157,7 @@ static void init_once(void *foo) iint->ima_file_status = INTEGRITY_UNKNOWN; iint->ima_mmap_status = INTEGRITY_UNKNOWN; iint->ima_bprm_status = INTEGRITY_UNKNOWN; - iint->ima_module_status = INTEGRITY_UNKNOWN; + iint->ima_read_status = INTEGRITY_UNKNOWN; iint->evm_status = INTEGRITY_UNKNOWN; } |