Merge tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 May 2021 22:32:18 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 May 2021 22:32:18 +0000 (15:32 -0700)
commite6f0bf09f0669b3c2cd77fa906830123279a0a21
tree57aed6ff25d40e31f129b934403c7fac7a8cc8c8
parent10a3efd0fee5e881b1866cf45950808575cb0f24
parent781a5739489949fd0f32432a9da17f7ddbccf1cc
Merge tag 'integrity-v5.13' of git://git./linux/kernel/git/zohar/linux-integrity

Pull IMA updates from Mimi Zohar:
 "In addition to loading the kernel module signing key onto the builtin
  keyring, load it onto the IMA keyring as well.

  Also six trivial changes and bug fixes"

* tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies
  ima: Fix fall-through warnings for Clang
  integrity: Add declarations to init_once void arguments.
  ima: Fix function name error in comment.
  ima: enable loading of build time generated key on .ima keyring
  ima: enable signing of modules with build time generated key
  keys: cleanup build time module signing keys
  ima: Fix the error code for restoring the PCR value
  ima: without an IMA policy loaded, return quickly
Makefile
certs/Kconfig
certs/Makefile
certs/system_keyring.c
include/keys/system_keyring.h
init/Kconfig
security/integrity/ima/ima_main.c