Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S268250AbUIWECg (ORCPT ); Thu, 23 Sep 2004 00:02:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268254AbUIWECg (ORCPT ); Thu, 23 Sep 2004 00:02:36 -0400 Received: from mx1.redhat.com ([66.187.233.31]:49605 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S268250AbUIWD5r (ORCPT ); Wed, 22 Sep 2004 23:57:47 -0400 Date: Wed, 22 Sep 2004 23:57:31 -0400 (EDT) From: James Morris X-X-Sender: jmorris@thoron.boston.redhat.com To: Andrew Morton , cc: Stephen Smalley , Christoph Hellwig , Andreas Gruenbacher , Subject: [PATCH 4/6] xattr consolidation v3 - ext2 In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 22864 Lines: 746 This patch converts ext2 xattr and acl code to the new generic xattr API. fs/ext2/acl.c | 45 +------- fs/ext2/acl.h | 3 fs/ext2/file.c | 8 - fs/ext2/namei.c | 16 +- fs/ext2/super.c | 1 fs/ext2/symlink.c | 16 +- fs/ext2/xattr.c | 262 +++++++++-------------------------------------- fs/ext2/xattr.h | 32 +---- fs/ext2/xattr_security.c | 13 +- fs/ext2/xattr_trusted.c | 11 + fs/ext2/xattr_user.c | 27 +--- 11 files changed, 117 insertions(+), 317 deletions(-) Signed-off-by: James Morris Signed-off-by: Stephen Smalley diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/acl.c linux-2.6.9-rc2-mm2.w/fs/ext2/acl.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/acl.c 2004-09-22 19:05:34.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/acl.c 2004-09-22 19:32:10.888759416 -0400 @@ -393,27 +393,27 @@ ext2_acl_chmod(struct inode *inode) * Extended attribut handlers */ static size_t -ext2_xattr_list_acl_access(char *list, struct inode *inode, - const char *name, int name_len) +ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size, + const char *name, size_t name_len) { const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); if (!test_opt(inode->i_sb, POSIX_ACL)) return 0; - if (list) + if (list && (size <= list_size)) memcpy(list, XATTR_NAME_ACL_ACCESS, size); return size; } static size_t -ext2_xattr_list_acl_default(char *list, struct inode *inode, - const char *name, int name_len) +ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size, + const char *name, size_t name_len) { const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); if (!test_opt(inode->i_sb, POSIX_ACL)) return 0; - if (list) + if (list && (size <= list_size)) memcpy(list, XATTR_NAME_ACL_DEFAULT, size); return size; } @@ -505,45 +505,16 @@ ext2_xattr_set_acl_default(struct inode return ext2_xattr_set_acl(inode, ACL_TYPE_DEFAULT, value, size); } -struct ext2_xattr_handler ext2_xattr_acl_access_handler = { +struct xattr_handler ext2_xattr_acl_access_handler = { .prefix = XATTR_NAME_ACL_ACCESS, .list = ext2_xattr_list_acl_access, .get = ext2_xattr_get_acl_access, .set = ext2_xattr_set_acl_access, }; -struct ext2_xattr_handler ext2_xattr_acl_default_handler = { +struct xattr_handler ext2_xattr_acl_default_handler = { .prefix = XATTR_NAME_ACL_DEFAULT, .list = ext2_xattr_list_acl_default, .get = ext2_xattr_get_acl_default, .set = ext2_xattr_set_acl_default, }; - -void -exit_ext2_acl(void) -{ - ext2_xattr_unregister(EXT2_XATTR_INDEX_POSIX_ACL_ACCESS, - &ext2_xattr_acl_access_handler); - ext2_xattr_unregister(EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT, - &ext2_xattr_acl_default_handler); -} - -int __init -init_ext2_acl(void) -{ - int error; - - error = ext2_xattr_register(EXT2_XATTR_INDEX_POSIX_ACL_ACCESS, - &ext2_xattr_acl_access_handler); - if (error) - goto fail; - error = ext2_xattr_register(EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT, - &ext2_xattr_acl_default_handler); - if (error) - goto fail; - return 0; - -fail: - exit_ext2_acl(); - return error; -} diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/acl.h linux-2.6.9-rc2-mm2.w/fs/ext2/acl.h --- linux-2.6.9-rc2-mm2.p/fs/ext2/acl.h 2004-09-13 01:32:56.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/acl.h 2004-09-22 19:32:10.889759264 -0400 @@ -63,9 +63,6 @@ extern int ext2_permission (struct inode extern int ext2_acl_chmod (struct inode *); extern int ext2_init_acl (struct inode *, struct inode *); -extern int init_ext2_acl(void); -extern void exit_ext2_acl(void); - #else #include #define ext2_permission NULL diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/file.c linux-2.6.9-rc2-mm2.w/fs/ext2/file.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/file.c 2004-09-13 01:32:16.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/file.c 2004-09-22 19:32:10.890759112 -0400 @@ -57,10 +57,12 @@ struct file_operations ext2_file_operati struct inode_operations ext2_file_inode_operations = { .truncate = ext2_truncate, - .setxattr = ext2_setxattr, - .getxattr = ext2_getxattr, +#ifdef CONFIG_EXT2_FS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ext2_listxattr, - .removexattr = ext2_removexattr, + .removexattr = generic_removexattr, +#endif .setattr = ext2_setattr, .permission = ext2_permission, }; diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/namei.c linux-2.6.9-rc2-mm2.w/fs/ext2/namei.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/namei.c 2004-09-13 01:33:23.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/namei.c 2004-09-22 19:32:10.891758960 -0400 @@ -395,19 +395,23 @@ struct inode_operations ext2_dir_inode_o .rmdir = ext2_rmdir, .mknod = ext2_mknod, .rename = ext2_rename, - .setxattr = ext2_setxattr, - .getxattr = ext2_getxattr, +#ifdef CONFIG_EXT2_FS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ext2_listxattr, - .removexattr = ext2_removexattr, + .removexattr = generic_removexattr, +#endif .setattr = ext2_setattr, .permission = ext2_permission, }; struct inode_operations ext2_special_inode_operations = { - .setxattr = ext2_setxattr, - .getxattr = ext2_getxattr, +#ifdef CONFIG_EXT2_FS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ext2_listxattr, - .removexattr = ext2_removexattr, + .removexattr = generic_removexattr, +#endif .setattr = ext2_setattr, .permission = ext2_permission, }; diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/super.c linux-2.6.9-rc2-mm2.w/fs/ext2/super.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/super.c 2004-09-13 01:32:55.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/super.c 2004-09-22 19:32:10.893758656 -0400 @@ -800,6 +800,7 @@ static int ext2_fill_super(struct super_ */ sb->s_op = &ext2_sops; sb->s_export_op = &ext2_export_ops; + sb->s_xattr = ext2_xattr_handlers; root = iget(sb, EXT2_ROOT_INO); sb->s_root = d_alloc_root(root); if (!sb->s_root) { diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/symlink.c linux-2.6.9-rc2-mm2.w/fs/ext2/symlink.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/symlink.c 2004-09-13 01:31:58.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/symlink.c 2004-09-22 19:32:10.893758656 -0400 @@ -32,17 +32,21 @@ struct inode_operations ext2_symlink_ino .readlink = generic_readlink, .follow_link = page_follow_link_light, .put_link = page_put_link, - .setxattr = ext2_setxattr, - .getxattr = ext2_getxattr, +#ifdef CONFIG_EXT2_FS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ext2_listxattr, - .removexattr = ext2_removexattr, + .removexattr = generic_removexattr, +#endif }; struct inode_operations ext2_fast_symlink_inode_operations = { .readlink = generic_readlink, .follow_link = ext2_follow_link, - .setxattr = ext2_setxattr, - .getxattr = ext2_getxattr, +#ifdef CONFIG_EXT2_FS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ext2_listxattr, - .removexattr = ext2_removexattr, + .removexattr = generic_removexattr, +#endif }; diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/xattr.c linux-2.6.9-rc2-mm2.w/fs/ext2/xattr.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/xattr.c 2004-09-13 01:32:54.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/xattr.c 2004-09-22 19:32:10.895758352 -0400 @@ -6,6 +6,9 @@ * Fix by Harrison Xing . * Extended attributes for symlinks and special files added per * suggestion of Luka Renko . + * xattr consolidation Copyright (c) 2004 James Morris , + * Red Hat Inc. + * */ /* @@ -62,8 +65,6 @@ #include "acl.h" /* These symbols may be needed by a module. */ -EXPORT_SYMBOL(ext2_xattr_register); -EXPORT_SYMBOL(ext2_xattr_unregister); EXPORT_SYMBOL(ext2_xattr_get); EXPORT_SYMBOL(ext2_xattr_list); EXPORT_SYMBOL(ext2_xattr_set); @@ -104,101 +105,40 @@ static void ext2_xattr_rehash(struct ext struct ext2_xattr_entry *); static struct mb_cache *ext2_xattr_cache; -static struct ext2_xattr_handler *ext2_xattr_handlers[EXT2_XATTR_INDEX_MAX]; -static rwlock_t ext2_handler_lock = RW_LOCK_UNLOCKED; - -int -ext2_xattr_register(int name_index, struct ext2_xattr_handler *handler) -{ - int error = -EINVAL; - - if (name_index > 0 && name_index <= EXT2_XATTR_INDEX_MAX) { - write_lock(&ext2_handler_lock); - if (!ext2_xattr_handlers[name_index-1]) { - ext2_xattr_handlers[name_index-1] = handler; - error = 0; - } - write_unlock(&ext2_handler_lock); - } - return error; -} - -void -ext2_xattr_unregister(int name_index, struct ext2_xattr_handler *handler) -{ - if (name_index > 0 || name_index <= EXT2_XATTR_INDEX_MAX) { - write_lock(&ext2_handler_lock); - ext2_xattr_handlers[name_index-1] = NULL; - write_unlock(&ext2_handler_lock); - } -} - -static inline const char * -strcmp_prefix(const char *a, const char *a_prefix) -{ - while (*a_prefix && *a == *a_prefix) { - a++; - a_prefix++; - } - return *a_prefix ? NULL : a; -} -/* - * Decode the extended attribute name, and translate it into - * the name_index and name suffix. - */ -static struct ext2_xattr_handler * -ext2_xattr_resolve_name(const char **name) -{ - struct ext2_xattr_handler *handler = NULL; - int i; +static struct xattr_handler *ext2_xattr_handler_map[EXT2_XATTR_INDEX_MAX] = { + [EXT2_XATTR_INDEX_USER] = &ext2_xattr_user_handler, +#ifdef CONFIG_EXT2_FS_POSIX_ACL + [EXT2_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext2_xattr_acl_access_handler, + [EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext2_xattr_acl_default_handler, +#endif + [EXT2_XATTR_INDEX_TRUSTED] = &ext2_xattr_trusted_handler, +#ifdef CONFIG_EXT2_FS_SECURITY + [EXT2_XATTR_INDEX_SECURITY] = &ext2_xattr_security_handler, +#endif +}; - if (!*name) - return NULL; - read_lock(&ext2_handler_lock); - for (i=0; iprefix); - if (n) { - handler = ext2_xattr_handlers[i]; - *name = n; - break; - } - } - } - read_unlock(&ext2_handler_lock); - return handler; -} +struct xattr_handler *ext2_xattr_handlers[] = { + &ext2_xattr_user_handler, + &ext2_xattr_trusted_handler, +#ifdef CONFIG_EXT2_FS_POSIX_ACL + &ext2_xattr_acl_access_handler, + &ext2_xattr_acl_default_handler, +#endif +#ifdef CONFIG_EXT2_FS_SECURITY + &ext2_xattr_security_handler, +#endif + NULL +}; -static inline struct ext2_xattr_handler * +static inline struct xattr_handler * ext2_xattr_handler(int name_index) { - struct ext2_xattr_handler *handler = NULL; - if (name_index > 0 && name_index <= EXT2_XATTR_INDEX_MAX) { - read_lock(&ext2_handler_lock); - handler = ext2_xattr_handlers[name_index-1]; - read_unlock(&ext2_handler_lock); - } - return handler; -} + struct xattr_handler *handler = NULL; -/* - * Inode operation getxattr() - * - * dentry->d_inode->i_sem: don't care - */ -ssize_t -ext2_getxattr(struct dentry *dentry, const char *name, - void *buffer, size_t size) -{ - struct ext2_xattr_handler *handler; - struct inode *inode = dentry->d_inode; - - handler = ext2_xattr_resolve_name(&name); - if (!handler) - return -EOPNOTSUPP; - return handler->get(inode, name, buffer, size); + if (name_index > 0 && name_index <= EXT2_XATTR_INDEX_MAX) + handler = ext2_xattr_handler_map[name_index]; + return handler; } /* @@ -213,43 +153,6 @@ ext2_listxattr(struct dentry *dentry, ch } /* - * Inode operation setxattr() - * - * dentry->d_inode->i_sem: down - */ -int -ext2_setxattr(struct dentry *dentry, const char *name, - const void *value, size_t size, int flags) -{ - struct ext2_xattr_handler *handler; - struct inode *inode = dentry->d_inode; - - if (size == 0) - value = ""; /* empty EA, do not remove */ - handler = ext2_xattr_resolve_name(&name); - if (!handler) - return -EOPNOTSUPP; - return handler->set(inode, name, value, size, flags); -} - -/* - * Inode operation removexattr() - * - * dentry->d_inode->i_sem: down - */ -int -ext2_removexattr(struct dentry *dentry, const char *name) -{ - struct ext2_xattr_handler *handler; - struct inode *inode = dentry->d_inode; - - handler = ext2_xattr_resolve_name(&name); - if (!handler) - return -EOPNOTSUPP; - return handler->set(inode, name, NULL, 0, XATTR_REPLACE); -} - -/* * ext2_xattr_get() * * Copy an extended attribute into the buffer @@ -367,7 +270,7 @@ ext2_xattr_list(struct inode *inode, cha { struct buffer_head *bh = NULL; struct ext2_xattr_entry *entry; - size_t size = 0; + size_t total_size = 0; char *buf, *end; int error; @@ -394,44 +297,37 @@ bad_block: ext2_error(inode->i_sb, "ext2 error = -EIO; goto cleanup; } - /* compute the size required for the list of attribute names */ - for (entry = FIRST_ENTRY(bh); !IS_LAST_ENTRY(entry); - entry = EXT2_XATTR_NEXT(entry)) { - struct ext2_xattr_handler *handler; - struct ext2_xattr_entry *next = - EXT2_XATTR_NEXT(entry); - if ((char *)next >= end) - goto bad_block; - - handler = ext2_xattr_handler(entry->e_name_index); - if (handler) - size += handler->list(NULL, inode, entry->e_name, - entry->e_name_len); - } if (ext2_xattr_cache_insert(bh)) ea_idebug(inode, "cache insert failed"); - if (!buffer) { - error = size; - goto cleanup; - } else { - error = -ERANGE; - if (size > buffer_size) - goto cleanup; - } /* list the attribute names */ buf = buffer; for (entry = FIRST_ENTRY(bh); !IS_LAST_ENTRY(entry); entry = EXT2_XATTR_NEXT(entry)) { - struct ext2_xattr_handler *handler; + struct xattr_handler *handler; + struct ext2_xattr_entry *next = EXT2_XATTR_NEXT(entry); + if ((char *)next >= end) + goto bad_block; + handler = ext2_xattr_handler(entry->e_name_index); - if (handler) - buf += handler->list(buf, inode, entry->e_name, - entry->e_name_len); + if (handler) { + size_t size = handler->list(inode, buf, buffer_size, + entry->e_name, + entry->e_name_len); + if (buf) { + if (size > buffer_size) { + error = -ERANGE; + goto cleanup; + } + buf += size; + buffer_size -= size; + } + total_size += size; + } } - error = size; + error = total_size; cleanup: brelse(bh); @@ -1120,66 +1016,16 @@ static void ext2_xattr_rehash(struct ext int __init init_ext2_xattr(void) { - int err; - - err = ext2_xattr_register(EXT2_XATTR_INDEX_USER, - &ext2_xattr_user_handler); - if (err) - return err; - err = ext2_xattr_register(EXT2_XATTR_INDEX_TRUSTED, - &ext2_xattr_trusted_handler); - if (err) - goto out; -#ifdef CONFIG_EXT2_FS_SECURITY - err = ext2_xattr_register(EXT2_XATTR_INDEX_SECURITY, - &ext2_xattr_security_handler); - if (err) - goto out1; -#endif -#ifdef CONFIG_EXT2_FS_POSIX_ACL - err = init_ext2_acl(); - if (err) - goto out2; -#endif ext2_xattr_cache = mb_cache_create("ext2_xattr", NULL, sizeof(struct mb_cache_entry) + sizeof(struct mb_cache_entry_index), 1, 6); - if (!ext2_xattr_cache) { - err = -ENOMEM; - goto out3; - } + if (!ext2_xattr_cache) + return -ENOMEM; return 0; -out3: -#ifdef CONFIG_EXT2_FS_POSIX_ACL - exit_ext2_acl(); -out2: -#endif -#ifdef CONFIG_EXT2_FS_SECURITY - ext2_xattr_unregister(EXT2_XATTR_INDEX_SECURITY, - &ext2_xattr_security_handler); -out1: -#endif - ext2_xattr_unregister(EXT2_XATTR_INDEX_TRUSTED, - &ext2_xattr_trusted_handler); -out: - ext2_xattr_unregister(EXT2_XATTR_INDEX_USER, - &ext2_xattr_user_handler); - return err; } void exit_ext2_xattr(void) { mb_cache_destroy(ext2_xattr_cache); -#ifdef CONFIG_EXT2_FS_POSIX_ACL - exit_ext2_acl(); -#endif -#ifdef CONFIG_EXT2_FS_SECURITY - ext2_xattr_unregister(EXT2_XATTR_INDEX_SECURITY, - &ext2_xattr_security_handler); -#endif - ext2_xattr_unregister(EXT2_XATTR_INDEX_TRUSTED, - &ext2_xattr_trusted_handler); - ext2_xattr_unregister(EXT2_XATTR_INDEX_USER, - &ext2_xattr_user_handler); } diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/xattr.h linux-2.6.9-rc2-mm2.w/fs/ext2/xattr.h --- linux-2.6.9-rc2-mm2.p/fs/ext2/xattr.h 2004-09-13 01:32:55.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/xattr.h 2004-09-22 19:32:10.896758200 -0400 @@ -57,23 +57,13 @@ struct ext2_xattr_entry { # ifdef CONFIG_EXT2_FS_XATTR -struct ext2_xattr_handler { - char *prefix; - size_t (*list)(char *list, struct inode *inode, const char *name, - int 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); -}; +extern struct xattr_handler ext2_xattr_user_handler; +extern struct xattr_handler ext2_xattr_trusted_handler; +extern struct xattr_handler ext2_xattr_acl_access_handler; +extern struct xattr_handler ext2_xattr_acl_default_handler; +extern struct xattr_handler ext2_xattr_security_handler; -extern int ext2_xattr_register(int, struct ext2_xattr_handler *); -extern void ext2_xattr_unregister(int, struct ext2_xattr_handler *); - -extern int ext2_setxattr(struct dentry *, const char *, const void *, size_t, int); -extern ssize_t ext2_getxattr(struct dentry *, const char *, void *, size_t); extern ssize_t ext2_listxattr(struct dentry *, char *, size_t); -extern int ext2_removexattr(struct dentry *, const char *); extern int ext2_xattr_get(struct inode *, int, const char *, void *, size_t); extern int ext2_xattr_list(struct inode *, char *, size_t); @@ -85,11 +75,9 @@ extern void ext2_xattr_put_super(struct extern int init_ext2_xattr(void); extern void exit_ext2_xattr(void); +extern struct xattr_handler *ext2_xattr_handlers[]; + # else /* CONFIG_EXT2_FS_XATTR */ -# define ext2_setxattr NULL -# define ext2_getxattr NULL -# define ext2_listxattr NULL -# define ext2_removexattr NULL static inline int ext2_xattr_get(struct inode *inode, int name_index, @@ -132,9 +120,7 @@ exit_ext2_xattr(void) { } -# endif /* CONFIG_EXT2_FS_XATTR */ +#define ext2_xattr_handlers NULL -extern struct ext2_xattr_handler ext2_xattr_user_handler; -extern struct ext2_xattr_handler ext2_xattr_trusted_handler; -extern struct ext2_xattr_handler ext2_xattr_security_handler; +# endif /* CONFIG_EXT2_FS_XATTR */ diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_security.c linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_security.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_security.c 2004-09-13 01:32:47.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_security.c 2004-09-22 19:32:10.897758048 -0400 @@ -11,17 +11,18 @@ #include "xattr.h" static size_t -ext2_xattr_security_list(char *list, struct inode *inode, - const char *name, int name_len) +ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size, + const char *name, size_t name_len) { const int prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1; - - if (list) { + const size_t total_len = prefix_len + name_len + 1; + + if (list && (total_len <= list_size)) { memcpy(list, XATTR_SECURITY_PREFIX, prefix_len); memcpy(list+prefix_len, name, name_len); list[prefix_len + name_len] = '\0'; } - return prefix_len + name_len + 1; + return total_len; } static int @@ -44,7 +45,7 @@ ext2_xattr_security_set(struct inode *in value, size, flags); } -struct ext2_xattr_handler ext2_xattr_security_handler = { +struct xattr_handler ext2_xattr_security_handler = { .prefix = XATTR_SECURITY_PREFIX, .list = ext2_xattr_security_list, .get = ext2_xattr_security_get, diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_trusted.c linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_trusted.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_trusted.c 2004-09-13 01:31:43.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_trusted.c 2004-09-22 19:32:10.898757896 -0400 @@ -15,20 +15,21 @@ #define XATTR_TRUSTED_PREFIX "trusted." static size_t -ext2_xattr_trusted_list(char *list, struct inode *inode, - const char *name, int name_len) +ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size, + const char *name, size_t name_len) { const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1; + const size_t total_len = prefix_len + name_len + 1; if (!capable(CAP_SYS_ADMIN)) return 0; - if (list) { + if (list && (total_len <= list_size)) { memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len); memcpy(list+prefix_len, name, name_len); list[prefix_len + name_len] = '\0'; } - return prefix_len + name_len + 1; + return total_len; } static int @@ -55,7 +56,7 @@ ext2_xattr_trusted_set(struct inode *ino value, size, flags); } -struct ext2_xattr_handler ext2_xattr_trusted_handler = { +struct xattr_handler ext2_xattr_trusted_handler = { .prefix = XATTR_TRUSTED_PREFIX, .list = ext2_xattr_trusted_list, .get = ext2_xattr_trusted_get, diff -purN -X dontdiff linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_user.c linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_user.c --- linux-2.6.9-rc2-mm2.p/fs/ext2/xattr_user.c 2004-09-13 01:32:54.000000000 -0400 +++ linux-2.6.9-rc2-mm2.w/fs/ext2/xattr_user.c 2004-09-22 19:32:10.899757744 -0400 @@ -14,20 +14,21 @@ #define XATTR_USER_PREFIX "user." static size_t -ext2_xattr_user_list(char *list, struct inode *inode, - const char *name, int name_len) +ext2_xattr_user_list(struct inode *inode, char *list, size_t list_size, + const char *name, size_t name_len) { - const int prefix_len = sizeof(XATTR_USER_PREFIX)-1; + const size_t prefix_len = sizeof(XATTR_USER_PREFIX)-1; + const size_t total_len = prefix_len + name_len + 1; if (!test_opt(inode->i_sb, XATTR_USER)) return 0; - if (list) { + if (list && (total_len <= list_size)) { memcpy(list, XATTR_USER_PREFIX, prefix_len); memcpy(list+prefix_len, name, name_len); list[prefix_len + name_len] = '\0'; } - return prefix_len + name_len + 1; + return total_len; } static int @@ -68,23 +69,9 @@ ext2_xattr_user_set(struct inode *inode, value, size, flags); } -struct ext2_xattr_handler ext2_xattr_user_handler = { +struct xattr_handler ext2_xattr_user_handler = { .prefix = XATTR_USER_PREFIX, .list = ext2_xattr_user_list, .get = ext2_xattr_user_get, .set = ext2_xattr_user_set, }; - -int __init -init_ext2_xattr_user(void) -{ - return ext2_xattr_register(EXT2_XATTR_INDEX_USER, - &ext2_xattr_user_handler); -} - -void -exit_ext2_xattr_user(void) -{ - ext2_xattr_unregister(EXT2_XATTR_INDEX_USER, - &ext2_xattr_user_handler); -} - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/