[v8,13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names.

Message ID	1535484161-11059-14-git-send-email-allison.henderson@oracle.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: Allison Henderson <allison.henderson@oracle.com> To: linux-xfs@vger.kernel.org Subject: [PATCH v8 13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names. Date: Tue, 28 Aug 2018 12:22:26 -0700 Message-Id: <1535484161-11059-14-git-send-email-allison.henderson@oracle.com> In-Reply-To: <1535484161-11059-1-git-send-email-allison.henderson@oracle.com> References: <1535484161-11059-1-git-send-email-allison.henderson@oracle.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	Parent Pointers v8 \| expand [v8,00/28] Parent Pointers v8 [v8,01/28] xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h [v8,02/28] xfs: Add helper function xfs_attr_try_sf_addname [v8,03/28] xfs: Add attibute set and helper functions [v8,04/28] xfs: Add attibute remove and helper functions [v8,05/28] xfs: Hold inode locks in xfs_ialloc [v8,06/28] xfs: Add trans toggle to attr routines [v8,07/28] xfs: Set up infastructure for deferred attribute operations [v8,08/28] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred [v8,09/28] xfs: Add xfs_has_attr and subroutines [v8,10/28] xfs: Add attr context to log item [v8,11/28] xfs: Roll delayed attr operations by returning EAGAIN [v8,12/28] xfs: Remove roll_trans boolean [v8,13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names. [v8,14/28] xfs: get directory offset when adding directory name [v8,15/28] xfs: get directory offset when removing directory name [v8,16/28] xfs: get directory offset when replacing a directory name [v8,17/28] xfs: add parent pointer support to attribute code [v8,18/28] xfs: define parent pointer xattr format [v8,19/28] xfs: extent transaction reservations for parent attributes [v8,20/28] xfs: parent pointer attribute creation [v8,21/28] xfs: add parent attributes to link [v8,22/28] xfs: remove parent pointers in unlink [v8,23/28] xfs: Add parent pointers to rename [v8,24/28] xfs: Add the parent pointer support to the superblock version 5. [v8,25/28] xfs: Add helper function xfs_attr_list_context_init [v8,26/28] xfs: Increase XFS_DEFER_OPS_NR_INODES to 4 [v8,27/28] xfs: Add parent pointer ioctl [v8,28/28] xfs: Add delayed attributes error tag

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 79e7650..34f4ab0 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -70,6 +70,7 @@ xfs_attr_args_init( struct xfs_da_args *args, struct xfs_inode *dp, const unsigned char *name, + size_t namelen, int flags) { @@ -82,7 +83,7 @@ xfs_attr_args_init( args->dp = dp; args->flags = flags; args->name = name; - args->namelen = strlen((const char *)name); + args->namelen = namelen; if (args->namelen >= MAXNAMELEN) return -EFAULT; /* match IRIX behaviour */ @@ -128,6 +129,7 @@ int xfs_attr_get( struct xfs_inode *ip, const unsigned char *name, + size_t namelen, unsigned char *value, int *valuelenp, int flags) @@ -141,7 +143,7 @@ xfs_attr_get( if (XFS_FORCED_SHUTDOWN(ip->i_mount)) return -EIO; - error = xfs_attr_args_init(&args, ip, name, flags); + error = xfs_attr_args_init(&args, ip, name, namelen, flags); if (error) return error; @@ -370,6 +372,7 @@ int xfs_attr_set( struct xfs_inode *dp, const unsigned char *name, + size_t namelen, unsigned char *value, int valuelen, int flags) @@ -386,7 +389,7 @@ xfs_attr_set( if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return -EIO; - error = xfs_attr_args_init(&args, dp, name, flags); + error = xfs_attr_args_init(&args, dp, name, namelen, flags); if (error) return error; @@ -438,7 +441,7 @@ xfs_attr_set( xfs_trans_ijoin(args.trans, dp, 0); - error = xfs_attr_set_deferred(dp, args.trans, name, strlen(name), + error = xfs_attr_set_deferred(dp, args.trans, name, namelen, value, valuelen, flags); if (error) goto out; @@ -525,6 +528,7 @@ int xfs_attr_remove( struct xfs_inode *dp, const unsigned char *name, + size_t namelen, int flags) { struct xfs_mount *mp = dp->i_mount; @@ -536,7 +540,7 @@ xfs_attr_remove( if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return -EIO; - error = xfs_attr_args_init(&args, dp, name, flags); + error = xfs_attr_args_init(&args, dp, name, namelen, flags); if (error) return error; @@ -575,7 +579,7 @@ xfs_attr_remove( error = xfs_attr_remove_deferred(dp, args.trans, - name, strlen(name), flags); + name, namelen, flags); if (error) goto out; diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 3a51c84..bee449d 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -174,18 +174,20 @@ int xfs_attr_list_int(struct xfs_attr_list_context *); int xfs_inode_hasattr(struct xfs_inode *ip); int xfs_attr_get_ilocked(struct xfs_inode *ip, struct xfs_da_args *args); int xfs_attr_get(struct xfs_inode *ip, const unsigned char *name, - unsigned char *value, int *valuelenp, int flags); + size_t namelen, unsigned char *value, int *valuelenp, + int flags); int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name, - unsigned char *value, int valuelen, int flags); + size_t namelen, unsigned char *value, int valuelen, int flags); int xfs_attr_set_args(struct xfs_da_args *args, struct xfs_buf **leaf_bp, xfs_attr_state_t *state); -int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, int flags); +int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, + size_t namelen, int flags); int xfs_has_attr(struct xfs_da_args *args); int xfs_attr_remove_args(struct xfs_da_args *args); int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, int flags, struct attrlist_cursor_kern *cursor); int xfs_attr_args_init(struct xfs_da_args *args, struct xfs_inode *dp, - const unsigned char *name, int flags); + const unsigned char *name, size_t namelen, int flags); int xfs_attr_calc_size(struct xfs_da_args *args, int *local); int xfs_attr_set_deferred(struct xfs_inode *dp, struct xfs_trans *tp, void *name, unsigned int name_len, void *value, diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 48166df..9b1b93e 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -143,8 +143,8 @@ xfs_get_acl(struct inode *inode, int type) if (!xfs_acl) return ERR_PTR(-ENOMEM); - error = xfs_attr_get(ip, ea_name, (unsigned char *)xfs_acl, - &len, ATTR_ROOT); + error = xfs_attr_get(ip, ea_name, strlen(ea_name), + (unsigned char *)xfs_acl, &len, ATTR_ROOT); if (error) { /* * If the attribute doesn't exist make sure we have a negative @@ -194,15 +194,17 @@ __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) len -= sizeof(struct xfs_acl_entry) * (XFS_ACL_MAX_ENTRIES(ip->i_mount) - acl->a_count); - error = xfs_attr_set(ip, ea_name, (unsigned char *)xfs_acl, - len, ATTR_ROOT); + error = xfs_attr_set(ip, ea_name, strlen(ea_name), + (unsigned char *)xfs_acl, len, ATTR_ROOT); kmem_free(xfs_acl); } else { /* * A NULL ACL argument means we want to remove the ACL. */ - error = xfs_attr_remove(ip, ea_name, ATTR_ROOT); + error = xfs_attr_remove(ip, ea_name, + strlen(ea_name), + ATTR_ROOT); /* * If the attribute didn't exist to start with that's fine. diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c index b8db2da..5cf87e7 100644 --- a/fs/xfs/xfs_attr_item.c +++ b/fs/xfs/xfs_attr_item.c @@ -530,7 +530,7 @@ xfs_attri_recover( return error; error = xfs_attr_args_init(&args, ip, attrip->name, - attrp->alfi_attr_flags); + attrp->alfi_name_len, attrp->alfi_attr_flags); if (error) return error; diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 6cd9218..b0a4b37 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -439,6 +439,7 @@ xfs_attrmulti_attr_get( { unsigned char *kbuf; int error = -EFAULT; + size_t namelen; if (*len > XFS_XATTR_SIZE_MAX) return -EINVAL; @@ -446,7 +447,9 @@ xfs_attrmulti_attr_get( if (!kbuf) return -ENOMEM; - error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags); + namelen = strlen(name); + error = xfs_attr_get(XFS_I(inode), name, namelen, + kbuf, (int *)len, flags); if (error) goto out_kfree; @@ -468,6 +471,7 @@ xfs_attrmulti_attr_set( { unsigned char *kbuf; int error; + size_t namelen; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; @@ -478,7 +482,8 @@ xfs_attrmulti_attr_set( if (IS_ERR(kbuf)) return PTR_ERR(kbuf); - error = xfs_attr_set(XFS_I(inode), name, kbuf, len, flags); + namelen = strlen(name); + error = xfs_attr_set(XFS_I(inode), name, namelen, kbuf, len, flags); if (!error) xfs_forget_acl(inode, name, flags); kfree(kbuf); @@ -492,10 +497,12 @@ xfs_attrmulti_attr_remove( uint32_t flags) { int error; + size_t namelen; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; - error = xfs_attr_remove(XFS_I(inode), name, flags); + namelen = strlen(name); + error = xfs_attr_remove(XFS_I(inode), name, namelen, flags); if (!error) xfs_forget_acl(inode, name, flags); return error; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index ab605fe..f7b1e83 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -60,8 +60,10 @@ xfs_initxattrs( int error = 0; for (xattr = xattr_array; xattr->name != NULL; xattr++) { - error = xfs_attr_set(ip, xattr->name, xattr->value, - xattr->value_len, ATTR_SECURE); + error = xfs_attr_set(ip, xattr->name, + strlen(xattr->name), + xattr->value, xattr->value_len, + ATTR_SECURE); if (error < 0) break; } diff --git a/fs/xfs/xfs_trans_attr.c b/fs/xfs/xfs_trans_attr.c index 4d138a9..7e20721 100644 --- a/fs/xfs/xfs_trans_attr.c +++ b/fs/xfs/xfs_trans_attr.c @@ -201,7 +201,7 @@ xfs_attr_finish_item( /* Only need to initialize args context once */ name_value = ((char *)attr) + sizeof(struct xfs_attr_item); error = xfs_attr_args_init(args, attr->xattri_ip, name_value, - attr->xattri_flags); + attr->xattri_name_len, attr->xattri_flags); if (error) goto out; diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index 031f720..27a3fa4 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -27,6 +27,7 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, int xflags = handler->flags; struct xfs_inode *ip = XFS_I(inode); int error, asize = size; + size_t namelen = strlen(name); /* Convert Linux syscall to XFS internal ATTR flags */ if (!size) { @@ -34,7 +35,7 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, value = NULL; } - error = xfs_attr_get(ip, (unsigned char *)name, value, &asize, xflags); + error = xfs_attr_get(ip, name, namelen, value, &asize, xflags); if (error) return error; return asize; @@ -70,6 +71,7 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, int xflags = handler->flags; struct xfs_inode *ip = XFS_I(inode); int error; + size_t namelen = strlen(name); /* Convert Linux syscall to XFS internal ATTR flags */ if (flags & XATTR_CREATE) @@ -78,9 +80,9 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, xflags |= ATTR_REPLACE; if (!value) - return xfs_attr_remove(ip, (unsigned char *)name, xflags); - error = xfs_attr_set(ip, (unsigned char *)name, - (void *)value, size, xflags); + return xfs_attr_remove(ip, name, + namelen, xflags); + error = xfs_attr_set(ip, name, namelen, (void *)value, size, xflags); if (!error) xfs_forget_acl(inode, name, xflags);

[v8,13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names.

Commit Message

Patch