diff --git a/MAINTAINERS b/MAINTAINERS
index cd0e9c763bd8e94cc1d128c2da590fa34faf9ccd..f3bac2a8c6d654162d38077ffcb56cb49eb7a6c8 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 fc38ca08dbb54bd588430736199a6a21dda19b32..9700e96ab0f05cf27c6dee7bdf3f92fb762d3dab 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;