OSDN Git Service

Merge branch 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2019 18:08:44 +0000 (11:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2019 18:08:44 +0000 (11:08 -0700)
commitd266b3f5cac09434eb624af202f9a31307b34a88
treed773c0a422644c9e1e91fc2d89db898e4b4e956a
parent8164c5719b864da3bcfee97ad8af8cfd7ee5ad8c
parent8cdc23a3d9ec0944000ad43bad588e36afdc38cd
Merge branch 'next-fixes-for-5.2-rc' of git://git./linux/kernel/git/zohar/linux-integrity

Pull integrity subsystem fixes from Mimi Zohar:
 "Four bug fixes, none 5.2-specific, all marked for stable.

  The first two are related to the architecture specific IMA policy
  support. The other two patches, one is related to EVM signatures,
  based on additional hash algorithms, and the other is related to
  displaying the IMA policy"

* 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: show rules with IMA_INMASK correctly
  evm: check hash algorithm passed to init_desc()
  ima: fix wrong signed policy requirement when not appraising
  x86/ima: Check EFI_RUNTIME_SERVICES before using