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
Showing the changes to include/uapi/linux (1 of 16 files). Show all
Unified · Split
| @@ -148,6 +148,7 @@ · 147 unmodified lines | |||
| 148 | #define AUDIT_INTEGRITY_PCR 1804 /* PCR invalidation msgs */ | 148 | #define AUDIT_INTEGRITY_PCR 1804 /* PCR invalidation msgs */ |
| 149 | #define AUDIT_INTEGRITY_RULE 1805 /* policy rule */ | 149 | #define AUDIT_INTEGRITY_RULE 1805 /* policy rule */ |
| 150 | #define AUDIT_INTEGRITY_EVM_XATTR 1806 /* New EVM-covered xattr */ | 150 | #define AUDIT_INTEGRITY_EVM_XATTR 1806 /* New EVM-covered xattr */ |
| 151 | #define AUDIT_INTEGRITY_POLICY_RULE 1807 /* IMA policy rules */ | ||
| 151 | 152 | ||
| 152 | #define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ | 153 | #define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ |
| 153 | 154 | ||