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
niw · Feb 3, 2018 · 1726aa7 · 1726aa7
2 parents c80c238 + e259807
commit 1726aa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -7795,6 +7795,7 @@ F:	include/keys/encrypted-type.h
 F:	security/keys/encrypted-keys/
 
 KEYS-TRUSTED
+M:	James Bottomley <[email protected]>
 M:	Mimi Zohar <[email protected]>
 L:	[email protected]
 L:	[email protected]

diff --git 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;