Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 8 years ago 1726aa70 c80c238a

2 changed files

expand all

MAINTAINERS

security

integrity

iint.c

MAINTAINERS

··· 7795 7795 F: security/keys/encrypted-keys/ 7796 7796 7797 7797 KEYS-TRUSTED 7798 + M: James Bottomley <jejb@linux.vnet.ibm.com> 7798 7799 M: Mimi Zohar <zohar@linux.vnet.ibm.com> 7799 7800 L: linux-integrity@vger.kernel.org 7800 7801 L: keyrings@vger.kernel.org

security/integrity/iint.c

··· 74 74 iint->ima_hash = NULL; 75 75 iint->version = 0; 76 76 iint->flags = 0UL; 77 + iint->atomic_flags = 0UL; 77 78 iint->ima_file_status = INTEGRITY_UNKNOWN; 78 79 iint->ima_mmap_status = INTEGRITY_UNKNOWN; 79 80 iint->ima_bprm_status = INTEGRITY_UNKNOWN;