From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Aug 2018 05:54:12 +0000 (-0700)
Subject: Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri... 
X-Git-Tag: v5.15~8214
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f91e654474d413201ae578820fb63f8a811f6c4e;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'next-integrity' of git://git./linux/kernel/git/jmorris/linux-security

Pull integrity updates from James Morris:
 "This adds support for EVM signatures based on larger digests, contains
  a new audit record AUDIT_INTEGRITY_POLICY_RULE to differentiate the
  IMA policy rules from the IMA-audit messages, addresses two deadlocks
  due to either loading or searching for crypto algorithms, and cleans
  up the audit messages"

* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  EVM: fix return value check in evm_write_xattrs()
  integrity: prevent deadlock during digsig verification.
  evm: Allow non-SHA1 digital signatures
  evm: Don't deadlock if a crypto algorithm is unavailable
  integrity: silence warning when CONFIG_SECURITYFS is not enabled
  ima: Differentiate auditing policy rules from "audit" actions
  ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set
  ima: Use audit_log_format() rather than audit_log_string()
  ima: Call audit_log_string() rather than logging it untrusted
---

f91e654474d413201ae578820fb63f8a811f6c4e