diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:22:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:22:23 -0700 |
| commit | 57ce66d39f10fb01efabd72b14eb033deddb226b (patch) | |
| tree | aea270718c7b82df9cfcb10794d4b69cfaf61f38 /MAINTAINERS | |
| parent | 4ba9628fe5bf90e0125dbec847a0cf4f5553de14 (diff) | |
| parent | 34bccd61b139dbb452421aebf480e7af5f7a12ed (diff) | |
| download | linux-57ce66d39f10fb01efabd72b14eb033deddb226b.tar.gz | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity updates from James Morris: "From Mimi: This contains a couple of bug fixes, including one for a recent problem with calculating file hashes on overlayfs, and some code cleanup" * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: MAINTAINERS: add Jarkko as maintainer for trusted keys ima: open a new file instance if no read permissions ima: fix showing large 'violations' or 'runtime_measurements_count' security/integrity: remove unnecessary 'init_keyring' variable security/integrity: constify some read-only data vfs: require i_size <= SIZE_MAX in kernel_read_file()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9a8e039362dc..99540a5a4e19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8165,6 +8165,7 @@ F: security/keys/encrypted-keys/ KEYS-TRUSTED M: James Bottomley <jejb@linux.vnet.ibm.com> +M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> M: Mimi Zohar <zohar@linux.vnet.ibm.com> L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org |