• Linus Torvalds's avatar
    Merge tag 'integrity-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity · 4cec9293
    Linus Torvalds authored
    Pull integrity updates from Mimi Zohar:
     "The nicest change is the IMA policy rule checking. The other changes
      include allowing the kexec boot cmdline line measure policy rules to
      be defined in terms of the inode associated with the kexec kernel
      image, making the IMA_APPRAISE_BOOTPARAM, which governs the IMA
      appraise mode (log, fix, enforce), a runtime decision based on the
      secure boot mode of the system, and including errno in the audit log"
    
    * tag 'integrity-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
      integrity: remove redundant initialization of variable ret
      ima: move APPRAISE_BOOTPARAM dependency on ARCH_POLICY to runtime
      ima: AppArmor satisfies the audit rule requirements
      ima: Rename internal filter rule functions
      ima: Support additional conditionals in the KEXEC_CMDLINE hook function
      ima: Use the common function to detect LSM conditionals in a rule
      ima: Move comprehensive rule validation checks out of the token parser
      ima: Use correct type for the args_p member of ima_rule_entry.lsm elements
      ima: Shallow copy the args_p member of ima_rule_entry.lsm elements
      ima: Fail rule parsing when appraise_flag=blacklist is unsupportable
      ima: Fail rule parsing when the KEY_CHECK hook is combined with an invalid cond
      ima: Fail rule parsing when the KEXEC_CMDLINE hook is combined with an invalid cond
      ima: Fail rule parsing when buffer hook functions have an invalid action
      ima: Free the entire rule if it fails to parse
      ima: Free the entire rule when deleting a list of rules
      ima: Have the LSM free its audit rule
      IMA: Add audit log for failure conditions
      integrity: Add errno field in audit message
    4cec9293
kexec_file.c 32.6 KB