diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 17:32:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 17:32:04 -0700 |
commit | c3665a6be5de16cf6670a00003642114c44d8a70 (patch) | |
tree | 118ea5fd3cca09eeac0d7dc550915d0e338e4dfe /include/linux/stmmac.h | |
parent | 12ad143e1b803e541e48b8ba40f550250259ecdd (diff) | |
parent | 2e884fc9759d8816630d3c30694721a39b7396e0 (diff) | |
download | talos-op-linux-c3665a6be5de16cf6670a00003642114c44d8a70.tar.gz talos-op-linux-c3665a6be5de16cf6670a00003642114c44d8a70.zip |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity updates from James Morris:
"Mimi Zohar says:
'Linux 5.0 introduced the platform keyring to allow verifying the IMA
kexec kernel image signature using the pre-boot keys. This pull
request similarly makes keys on the platform keyring accessible for
verifying the PE kernel image signature.
Also included in this pull request is a new IMA hook that tags tmp
files, in policy, indicating the file hash needs to be calculated.
The remaining patches are cleanup'"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
evm: Use defined constant for UUID representation
ima: define ima_post_create_tmpfile() hook and add missing call
evm: remove set but not used variable 'xattr'
encrypted-keys: fix Opt_err/Opt_error = -1
kexec, KEYS: Make use of platform keyring for signature verify
integrity, KEYS: add a reference to platform keyring
Diffstat (limited to 'include/linux/stmmac.h')
0 files changed, 0 insertions, 0 deletions