dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-28 22:53:37 +02:00
Code Releases Activity

Add security.apparmor to the set of extended attributes used by EVM

Browse Source 
The kernel is taking security.apparmor into account when validating EVM,
so evmctl should be doing the same.

Signed-off-by: Matthew Garrett <mjg59@google.com>
Signed-off-by: Mimi Zohar <zoahr@linux.vnet.ibm.com>

Changelog:
- Prevent compilation from failing due to XATTR_NAME_APPARMOR not being
included in the kernel-headers package.
This commit is contained in:
Matthew Garrett 2018-04-17 15:56:01 -07:00 committed by Mimi Zohar
parent ae1319eeab
commit 9119f771a2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/evmctl.c
View File

@ -62,6 +62,11 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#ifndef XATTR_APPAARMOR_SUFFIX
#define XATTR_APPARMOR_SUFFIX "apparmor"
#define XATTR_NAME_APPARMOR XATTR_SECURITY_PREFIX XATTR_APPARMOR_SUFFIX
#endif
#define USE_FPRINTF #define USE_FPRINTF
#include "imaevm.h" #include "imaevm.h"
@ -69,6 +74,7 @@
static char *evm_default_xattrs[] = { static char *evm_default_xattrs[] = {
XATTR_NAME_SELINUX, XATTR_NAME_SELINUX,
XATTR_NAME_SMACK, XATTR_NAME_SMACK,
XATTR_NAME_APPARMOR,
XATTR_NAME_IMA, XATTR_NAME_IMA,
XATTR_NAME_CAPS, XATTR_NAME_CAPS,
NULL NULL
@ -80,6 +86,7 @@ static char *evm_extra_smack_xattrs[] = {
XATTR_NAME_SMACKEXEC, XATTR_NAME_SMACKEXEC,
XATTR_NAME_SMACKTRANSMUTE, XATTR_NAME_SMACKTRANSMUTE,
XATTR_NAME_SMACKMMAP, XATTR_NAME_SMACKMMAP,
XATTR_NAME_APPARMOR,
XATTR_NAME_IMA, XATTR_NAME_IMA,
XATTR_NAME_CAPS, XATTR_NAME_CAPS,
NULL NULL