diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
| commit | 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 (patch) | |
| tree | d0796f172c096147e1a7c0337279bf7dca6f13f2 /security/integrity/evm/evm_main.c | |
| parent | b25b09ecf98bf6a32f3732281c2db13be6aeb14c (diff) | |
| parent | 8606404fa555c2ee691376fcc640ab89fe752035 (diff) | |
| download | linux-9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252.tar.xz | |
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.
Diffstat (limited to 'security/integrity/evm/evm_main.c')
| -rw-r--r-- | security/integrity/evm/evm_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 8901501425f4..eb5484504f50 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -34,6 +34,9 @@ char *evm_config_xattrnames[] = { #ifdef CONFIG_SECURITY_SMACK XATTR_NAME_SMACK, #endif +#ifdef CONFIG_IMA_APPRAISE + XATTR_NAME_IMA, +#endif XATTR_NAME_CAPS, NULL }; |