• L
    Merge branch 'next-integrity' of... · 00d535a3
    Linus Torvalds 提交于
    Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
    
    Pull integrity updates from James Morris:
     "From Mimi:
    
       - add run time support for specifying additional security xattrs
         included in the security.evm HMAC/signature
    
       - some code clean up and bug fixes"
    
    * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      EVM: unlock on error path in evm_read_xattrs()
      EVM: prevent array underflow in evm_write_xattrs()
      EVM: Fix null dereference on xattr when xattr fails to allocate
      EVM: fix memory leak of temporary buffer 'temp'
      IMA: use list_splice_tail_init_rcu() instead of its open coded variant
      ima: use match_string() helper
      ima: fix updating the ima_appraise flag
      ima: based on policy verify firmware signatures (pre-allocated buffer)
      ima: define a new policy condition based on the filesystem name
      EVM: Allow runtime modification of the set of verified xattrs
      EVM: turn evm_config_xattrnames into a list
      integrity: Add an integrity directory in securityfs
      ima: Remove unused variable ima_initialized
      ima: Unify logging
      ima: Reflect correct permissions for policy
    00d535a3
evm_crypto.c 9.1 KB