diff options
| author | James Morris <jmorris@namei.org> | 2011-09-15 03:53:38 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-09-15 03:53:38 +0400 |
| commit | 8de6ac7f58a22fdab399fbe97763e465ea49c735 (patch) | |
| tree | 46104451c69f5270fcc11137aecff012a2ecf612 /include/linux | |
| parent | 843d183cdd816549b73e6bd3ae07f64adddf714b (diff) | |
| parent | fb788d8b981fa55603873416882f8dcf835e7924 (diff) | |
| download | linux-8de6ac7f58a22fdab399fbe97763e465ea49c735.tar.xz | |
Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/evm.h | 8 | ||||
| -rw-r--r-- | include/linux/integrity.h | 1 | ||||
| -rw-r--r-- | include/linux/xattr.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/evm.h b/include/linux/evm.h index ea603c9e775d..9fc13a760928 100644 --- a/include/linux/evm.h +++ b/include/linux/evm.h @@ -33,6 +33,14 @@ extern void evm_inode_post_removexattr(struct dentry *dentry, extern int evm_inode_init_security(struct inode *inode, const struct xattr *xattr_array, struct xattr *evm); +#ifdef CONFIG_FS_POSIX_ACL +extern int posix_xattr_acl(const char *xattrname); +#else +static inline int posix_xattr_acl(const char *xattrname) +{ + return 0; +} +#endif #else #ifdef CONFIG_INTEGRITY static inline enum integrity_status evm_verifyxattr(struct dentry *dentry, diff --git a/include/linux/integrity.h b/include/linux/integrity.h index 968443385678..a0c41256cb92 100644 --- a/include/linux/integrity.h +++ b/include/linux/integrity.h @@ -16,6 +16,7 @@ enum integrity_status { INTEGRITY_PASS = 0, INTEGRITY_FAIL, INTEGRITY_NOLABEL, + INTEGRITY_NOXATTRS, INTEGRITY_UNKNOWN, }; diff --git a/include/linux/xattr.h b/include/linux/xattr.h index b20cb965c322..e5d122031542 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -52,6 +52,11 @@ #define XATTR_CAPS_SUFFIX "capability" #define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX +#define XATTR_POSIX_ACL_ACCESS "posix_acl_access" +#define XATTR_NAME_POSIX_ACL_ACCESS XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_ACCESS +#define XATTR_POSIX_ACL_DEFAULT "posix_acl_default" +#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT + #ifdef __KERNEL__ #include <linux/types.h> |