]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorJames Morris <james.morris@microsoft.com>
Mon, 17 Dec 2018 19:26:46 +0000 (11:26 -0800)
committerJames Morris <james.morris@microsoft.com>
Mon, 17 Dec 2018 19:26:46 +0000 (11:26 -0800)
commit5580b4a1a8ca85c53bd5b94c5d302e47dca3e5cb
tree69597129504be73e8826be9984e05d073a5c47b5
parent8bd8ea195f6d135a8d85201116314eb5237ad7e7
parenteed9de3b4f47114f440980203ca27c5fab70f529
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-integrity

From Mimi:

In Linux 4.19, a new LSM hook named security_kernel_load_data was
upstreamed, allowing LSMs and IMA to prevent the kexec_load
syscall.  Different signature verification methods exist for verifying
the kexec'ed kernel image.  This pull request adds additional support
in IMA to prevent loading unsigned kernel images via the kexec_load
syscall, independently of the IMA policy rules, based on the runtime
"secure boot" flag.  An initial IMA kselftest is included.

In addition, this pull request defines a new, separate keyring named
".platform" for storing the preboot/firmware keys needed for verifying
the kexec'ed kernel image's signature and includes the associated IMA
kexec usage of the ".platform" keyring.

(David Howell's and Josh Boyer's patches for reading the
preboot/firmware keys, which were previously posted for a different
use case scenario, are included here.)
include/linux/efi.h
security/integrity/ima/ima_appraise.c
security/integrity/ima/ima_main.c
security/integrity/ima/ima_policy.c
tools/testing/selftests/Makefile