Skip to contentSkip to conversation

integrity subsystem updates for v5.7

GIT PULL Merged Mimi Zohar 2 participants 2 messages Apr 1, 2020 – Apr 2, 2020 Keys-trusted

lore
Share & tools
lore

Mimi Zohar

author maintainer
#0 lore raw

Hi Linus,

There's just a couple of updates for linux-5.7:
- A new Kconfig option to enable IMA architecture specific runtime policy rules needed for secure and/or trusted boot, as requested.

- Some message cleanup (eg. pr_fmt, additional error messages).

thanks,

Mimi

The following changes since commit f8788d86ab28f61f7b46eb6be375f8a726783636:

Linux 5.6-rc3 (2020-02-23 16:17:42 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git next-integrity

for you to fetch changes up to 9e2b4be377f0d715d9d910507890f9620cc22a9d:

ima: add a new CONFIG for loading arch-specific policies (2020-03-12 07:43:57 -0400)

----------------------------------------------------------------
Mimi Zohar (1):
Merge branch 'next-integrity.logging-cleanup' into next-integrity

Nayna Jain (1):
ima: add a new CONFIG for loading arch-specific policies

Tushar Sugandhi (3):
IMA: Update KBUILD_MODNAME for IMA files to ima
IMA: Add log statements for failure conditions
integrity: Remove duplicate pr_fmt definitions

 arch/powerpc/Kconfig                         | 1 +
 arch/s390/Kconfig                            | 1 +
 arch/s390/kernel/Makefile                    | 2 +-
 arch/x86/Kconfig                             | 1 +
 arch/x86/kernel/Makefile                     | 4 +---
 include/linux/ima.h                          | 3 +--
 security/integrity/digsig.c                  | 2 --
 security/integrity/digsig_asymmetric.c       | 2 --
 security/integrity/evm/evm_crypto.c          | 2 --
 security/integrity/evm/evm_main.c            | 2 --
 security/integrity/evm/evm_secfs.c           | 2 --
 security/integrity/ima/Kconfig               | 7 +++++++
 security/integrity/ima/Makefile              | 6 +++---
 security/integrity/ima/ima_asymmetric_keys.c | 2 --
 security/integrity/ima/ima_crypto.c          | 2 --
 security/integrity/ima/ima_fs.c              | 2 --
 security/integrity/ima/ima_init.c            | 2 --
 security/integrity/ima/ima_kexec.c           | 1 -
 security/integrity/ima/ima_main.c            | 5 +++--
 security/integrity/ima/ima_policy.c          | 2 --
 security/integrity/ima/ima_queue.c           | 2 --
 security/integrity/ima/ima_queue_keys.c      | 2 --
 security/integrity/ima/ima_template.c        | 2 --
 security/integrity/ima/ima_template_lib.c    | 2 --
 security/integrity/integrity.h               | 6 ++++++
 25 files changed, 25 insertions(+), 40 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Wed, 01 Apr 2020 18:03:17 -0400:

The pull request you sent on Wed, 01 Apr 2020 18:03:17 -0400:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git next-integrity

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7f218319caaaf6f2a43b22d8c82b898f32b4ec70

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker