Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1726aa70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-v4.16-rc1' of... 

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
parents c80c238a e2598077

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -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

security/integrity/iint.c

+1 −0
Original line number Diff line number Diff line
@@ -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;