diff options
| author | Linus Torvalds | 2018-02-03 22:44:29 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-03 22:44:29 +0100 |
| commit | 1726aa70e7e2f8967d60b4f836723b61f97db73e (patch) | |
| tree | 0f516117fb85498cc89c08142f98305bcec25cae | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | ima: re-initialize iint->atomic_flags (diff) | |
| download | kernel-qcow2-linux-1726aa70e7e2f8967d60b4f836723b61f97db73e.tar.gz kernel-qcow2-linux-1726aa70e7e2f8967d60b4f836723b61f97db73e.tar.xz kernel-qcow2-linux-1726aa70e7e2f8967d60b4f836723b61f97db73e.zip | |
Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity fixes from James Morris:
- add James Bottommley as a Trusted Keys maintainer.
- IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi.
* 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: re-initialize iint->atomic_flags
maintainers: update trusted keys
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | security/integrity/iint.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd0e9c763bd8..f3bac2a8c6d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7795,6 +7795,7 @@ F: include/keys/encrypted-type.h F: security/keys/encrypted-keys/ KEYS-TRUSTED +M: James Bottomley <jejb@linux.vnet.ibm.com> M: Mimi Zohar <zohar@linux.vnet.ibm.com> L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org diff --git a/security/integrity/iint.c b/security/integrity/iint.c index fc38ca08dbb5..9700e96ab0f0 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -74,6 +74,7 @@ static void iint_free(struct integrity_iint_cache *iint) iint->ima_hash = NULL; iint->version = 0; iint->flags = 0UL; + iint->atomic_flags = 0UL; iint->ima_file_status = INTEGRITY_UNKNOWN; iint->ima_mmap_status = INTEGRITY_UNKNOWN; iint->ima_bprm_status = INTEGRITY_UNKNOWN; |