Adds new simple_xattr_initxattrs() initialization function for initializing the extended attributes via LSM callback. Based on callback function used by tmpfs/shmem. This is allows for consolidation and avoiding code duplication when other filesystem need to implement a simple initxattrs LSM callback function. Signed-off-by: David Graziano <david.graziano@xxxxxxxxxxxxxxxxxxx> --- fs/xattr.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/xattr.h | 3 +++ 2 files changed, 42 insertions(+) diff --git a/fs/xattr.c b/fs/xattr.c index c243905..69dd142 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -994,3 +994,42 @@ void simple_xattr_list_add(struct simple_xattrs *xattrs, list_add(&new_xattr->list, &xattrs->head); spin_unlock(&xattrs->lock); } + +/* + * Callback for security_inode_init_security() for acquiring xattrs. + */ +int simple_xattr_initxattrs(struct inode *inode, + const struct xattr *xattr_array, + void *fs_info) +{ + struct simple_xattrs *xattrs; + const struct xattr *xattr; + struct simple_xattr *new_xattr; + size_t len; + + if (!fs_info) + return -ENOMEM; + xattrs = (struct simple_xattrs *) fs_info; + + for (xattr = xattr_array; xattr->name != NULL; xattr++) { + new_xattr = simple_xattr_alloc(xattr->value, xattr->value_len); + if (!new_xattr) + return -ENOMEM; + len = strlen(xattr->name) + 1; + new_xattr->name = kmalloc(XATTR_SECURITY_PREFIX_LEN + len, + GFP_KERNEL); + if (!new_xattr->name) { + kfree(new_xattr); + return -ENOMEM; + } + + memcpy(new_xattr->name, XATTR_SECURITY_PREFIX, + XATTR_SECURITY_PREFIX_LEN); + memcpy(new_xattr->name + XATTR_SECURITY_PREFIX_LEN, + xattr->name, len); + + simple_xattr_list_add(xattrs, new_xattr); + } + + return 0; +} diff --git a/include/linux/xattr.h b/include/linux/xattr.h index 94079ba..a787d1a 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -108,5 +108,8 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs, cha size_t size); void simple_xattr_list_add(struct simple_xattrs *xattrs, struct simple_xattr *new_xattr); +int simple_xattr_initxattrs(struct inode *inode, + const struct xattr *xattr_array, + void *fs_info); #endif /* _LINUX_XATTR_H */ -- 1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>