diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-27 19:37:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-27 19:37:27 -0700 |
| commit | f1f2f614d535564992f32e720739cb53cf03489f (patch) | |
| tree | 7c363b95df8d63954e822c98462fd3a9a98794ae /init | |
| parent | 298fb76a5583900a155d387efaf37a8b39e5dea2 (diff) | |
| parent | 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 (diff) | |
| download | linux-f1f2f614d535564992f32e720739cb53cf03489f.tar.gz linux-f1f2f614d535564992f32e720739cb53cf03489f.tar.bz2 linux-f1f2f614d535564992f32e720739cb53cf03489f.zip | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity updates from Mimi Zohar:
"The major feature in this time is IMA support for measuring and
appraising appended file signatures. In addition are a couple of bug
fixes and code cleanup to use struct_size().
In addition to the PE/COFF and IMA xattr signatures, the kexec kernel
image may be signed with an appended signature, using the same
scripts/sign-file tool that is used to sign kernel modules.
Similarly, the initramfs may contain an appended signature.
This contained a lot of refactoring of the existing appended signature
verification code, so that IMA could retain the existing framework of
calculating the file hash once, storing it in the IMA measurement list
and extending the TPM, verifying the file's integrity based on a file
hash or signature (eg. xattrs), and adding an audit record containing
the file hash, all based on policy. (The IMA support for appended
signatures patch set was posted and reviewed 11 times.)
The support for appended signature paves the way for adding other
signature verification methods, such as fs-verity, based on a single
system-wide policy. The file hash used for verifying the signature and
the signature, itself, can be included in the IMA measurement list"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
ima: ima_api: Use struct_size() in kzalloc()
ima: use struct_size() in kzalloc()
sefltest/ima: support appended signatures (modsig)
ima: Fix use after free in ima_read_modsig()
MODSIGN: make new include file self contained
ima: fix freeing ongoing ahash_request
ima: always return negative code for error
ima: Store the measurement again when appraising a modsig
ima: Define ima-modsig template
ima: Collect modsig
ima: Implement support for module-style appended signatures
ima: Factor xattr_verify() out of ima_appraise_measurement()
ima: Add modsig appraise_type option for module-style appended signatures
integrity: Select CONFIG_KEYS instead of depending on it
PKCS#7: Introduce pkcs7_get_digest()
PKCS#7: Refactor verify_pkcs7_signature()
MODSIGN: Export module signature definitions
ima: initialize the "template" field with the default template
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 57123594a7ca..92c867e25a29 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1963,6 +1963,10 @@ config BASE_SMALL default 0 if BASE_FULL default 1 if !BASE_FULL +config MODULE_SIG_FORMAT + def_bool n + select SYSTEM_DATA_VERIFICATION + menuconfig MODULES bool "Enable loadable module support" option modules @@ -2047,7 +2051,7 @@ config MODULE_SRCVERSION_ALL config MODULE_SIG bool "Module signature verification" - select SYSTEM_DATA_VERIFICATION + select MODULE_SIG_FORMAT help Check modules for valid signatures upon load: the signature is simply appended to the module. For more information see |