diff options
author | Nick Kralevich <nnk@google.com> | 2013-02-07 20:29:36 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-07 20:29:36 -0800 |
commit | 60e8d374a9d63da04017b945fd116e2a88f5072e (patch) | |
tree | ac4d32cd6d096683d140ed8375449e9e83315377 | |
parent | b75939d00fbb3484a0198be49449846d92b942ff (diff) | |
parent | 54cfa8364ffa13a1a9a472cea38791ed8c71591a (diff) | |
download | kernel-headers-60e8d374a9d63da04017b945fd116e2a88f5072e.tar.gz |
am 54cfa836: am cfbe0d8f: Merge "Update xattr.h"
# Via Android Git Automerger (1) and others
* commit '54cfa8364ffa13a1a9a472cea38791ed8c71591a':
Update xattr.h
-rw-r--r-- | original/linux/xattr.h | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/original/linux/xattr.h b/original/linux/xattr.h index cda8a96..ac62537 100644 --- a/original/linux/xattr.h +++ b/original/linux/xattr.h @@ -29,24 +29,33 @@ #define XATTR_USER_PREFIX "user." #define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1) +/* Security namespace */ +#define XATTR_EVM_SUFFIX "evm" +#define XATTR_NAME_EVM XATTR_SECURITY_PREFIX XATTR_EVM_SUFFIX + +#define XATTR_SELINUX_SUFFIX "selinux" +#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX + +#define XATTR_SMACK_SUFFIX "SMACK64" +#define XATTR_SMACK_IPIN "SMACK64IPIN" +#define XATTR_SMACK_IPOUT "SMACK64IPOUT" +#define XATTR_SMACK_EXEC "SMACK64EXEC" +#define XATTR_SMACK_TRANSMUTE "SMACK64TRANSMUTE" +#define XATTR_SMACK_MMAP "SMACK64MMAP" +#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_NAME_SMACKTRANSMUTE XATTR_SECURITY_PREFIX XATTR_SMACK_TRANSMUTE +#define XATTR_NAME_SMACKMMAP XATTR_SECURITY_PREFIX XATTR_SMACK_MMAP + +#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 -struct xattr_handler { - char *prefix; - size_t (*list)(struct inode *inode, char *list, size_t list_size, - const char *name, size_t name_len); - int (*get)(struct inode *inode, const char *name, void *buffer, - size_t size); - int (*set)(struct inode *inode, const char *name, const void *buffer, - size_t size, int flags); -}; - -ssize_t vfs_getxattr(struct dentry *, char *, void *, size_t); -int vfs_setxattr(struct dentry *, char *, void *, size_t, int); -int vfs_removexattr(struct dentry *, char *); - -ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size); -ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size); -int generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags); -int generic_removexattr(struct dentry *dentry, const char *name); #endif /* _LINUX_XATTR_H */ |