diff options
| author |   James Morris <jmorris@namei.org> | 2010-12-03 08:21:01 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-12-03 08:21:01 +1100 |
| commit | fe27d4b012273640e033be80f143bdc54daa8e16 (patch) | |
| tree | 4e58d69bf300ef2885644ec7f3950dc3fa87be3a /include/linux/xattr.h | |
| parent | security: Fix comment of security_key_permission (diff) | |
| parent | This patch adds a new security attribute to Smack called (diff) | |
| download | linux-dev-fe27d4b012273640e033be80f143bdc54daa8e16.tar.xz linux-dev-fe27d4b012273640e033be80f143bdc54daa8e16.zip | |
Merge branch 'smack-next-master' into next
Diffstat (limited to 'include/linux/xattr.h')
| -rw-r--r-- | include/linux/xattr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/xattr.h b/include/linux/xattr.h index f1e5bde4b35a..351c7901d74a 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -40,9 +40,11 @@ #define XATTR_SMACK_SUFFIX "SMACK64" #define XATTR_SMACK_IPIN "SMACK64IPIN" #define XATTR_SMACK_IPOUT "SMACK64IPOUT" +#define XATTR_SMACK_EXEC "SMACK64EXEC" #define XATTR_NAME_SMACK XATTR_SECURITY_PREFIX XATTR_SMACK_SUFFIX #define XATTR_NAME_SMACKIPIN XATTR_SECURITY_PREFIX XATTR_SMACK_IPIN #define XATTR_NAME_SMACKIPOUT XATTR_SECURITY_PREFIX XATTR_SMACK_IPOUT +#define XATTR_NAME_SMACKEXEC XATTR_SECURITY_PREFIX XATTR_SMACK_EXEC #define XATTR_CAPS_SUFFIX "capability" #define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX |