Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next

As requested by Mimi, this adds the IMA Appraisal feature.
2026-11-13 07:31:07 +00:00 · 2012-09-12 13:16:37 +10:00 · 2012-09-12 13:16:37 +10:00 · 9ddf6aa8cb
commit 9ddf6aa8cb
parent b25b09ecf9 8606404fa5
20 changed files with 668 additions and 149 deletions
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/fs/attr.c
+++ b/fs/attr.c
--- a/fs/file_table.c
+++ b/fs/file_table.c
--- a/fs/xattr.c
+++ b/fs/xattr.c
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
--- a/include/linux/integrity.h
+++ b/include/linux/integrity.h
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
--- a/security/integrity/iint.c
+++ b/security/integrity/iint.c
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
--- a/security/integrity/ima/Makefile
+++ b/security/integrity/ima/Makefile
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
--- a/security/security.c
+++ b/security/security.c