diff options
author | Matthew Garrett <mjg59@google.com> | 2017-10-13 15:09:25 -0700 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2017-11-08 15:16:36 -0500 |
commit | 096b85464832d2a7bd7bd6d4db2fafed2ab77244 (patch) | |
tree | f32705b9f405782125b07c597924e7b3f4d58ad2 /security/integrity/evm | |
parent | bb02b186d02f90f693bc573c392df843b024f4ef (diff) | |
download | op-kernel-dev-096b85464832d2a7bd7bd6d4db2fafed2ab77244.zip op-kernel-dev-096b85464832d2a7bd7bd6d4db2fafed2ab77244.tar.gz |
EVM: Include security.apparmor in EVM measurements
Apparmor will be gaining support for security.apparmor labels, and it
would be helpful to include these in EVM validation now so appropriate
signatures can be generated even before full support is merged.
Signed-off-by: Matthew Garrett <mjg59@google.com>
Acked-by: John Johansen <John.johansen@canonical.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/evm')
-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 063d38a..9826c02 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -49,6 +49,9 @@ char *evm_config_xattrnames[] = { XATTR_NAME_SMACKMMAP, #endif #endif +#ifdef CONFIG_SECURITY_APPARMOR + XATTR_NAME_APPARMOR, +#endif #ifdef CONFIG_IMA_APPRAISE XATTR_NAME_IMA, #endif |