On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote:
> Both XATTR_NAME_POSIX_ACL_ACCESS and XATTR_NAME_POSIX_ACL_DEFAULT have
> the same XATTR_SYSTEM_PREFIX prefix; don't check for the same prefix
> repeatedly.
>
> Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
> Reviewed-by: Steve French <steve.french@xxxxxxxxxxxxxxx>
> ---
> Âfs/xattr.c | 29 +++++++++++++++++++++++------
> Â1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/fs/xattr.c b/fs/xattr.c
> index 4beafc4..61ac218 100644
> --- a/fs/xattr.c
> +++ b/fs/xattr.c
> @@ -295,6 +295,16 @@ out:
> Â}
> ÂEXPORT_SYMBOL_GPL(vfs_removexattr);
> Â
> +static void
> +fix_xattr_from_user(const char *kname, void *kvalue, size_t size)
> +{
> + if (strncmp(kname, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
> + return;
> + kname += XATTR_SYSTEM_PREFIX_LEN;
> + if (!strcmp(kname, XATTR_POSIX_ACL_ACCESS) ||
> + ÂÂÂÂ!strcmp(kname, XATTR_POSIX_ACL_DEFAULT))
> + posix_acl_fix_xattr_from_user(kvalue, size);
> +}
> Â
> Â/*
> Â * Extended attribute SET operations
> @@ -329,9 +339,7 @@ setxattr(struct dentry *d, const char __user *name, const
> void __user *value,
> Â error = -EFAULT;
> Â goto out;
> Â }
> - if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
> - ÂÂÂÂ(strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
> - posix_acl_fix_xattr_from_user(kvalue, size);
> + fix_xattr_from_user(kname, kvalue, size);
> Â }
> Â
> Â error = vfs_setxattr(d, kname, kvalue, size, flags);
> @@ -396,6 +404,17 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *,
> name,
> Â return error;
> Â}
> Â
> +static void
> +fix_xattr_to_user(const char *kname, void *kvalue, size_t size)
> +{
> + if (strncmp(kname, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
> + return;
> + kname += XATTR_SYSTEM_PREFIX_LEN;
> + if (!strcmp(kname, XATTR_POSIX_ACL_ACCESS) ||
> + ÂÂÂÂ!strcmp(kname, XATTR_POSIX_ACL_DEFAULT))
> + posix_acl_fix_xattr_to_user(kvalue, size);
> +}
> +
> Â/*
> Â * Extended attribute GET operations
> Â */
> @@ -426,9 +445,7 @@ getxattr(struct dentry *d, const char __user *name, void
> __user *value,
> Â
> Â error = vfs_getxattr(d, kname, kvalue, size);
> Â if (error > 0) {
> - if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
> - ÂÂÂÂ(strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
> - posix_acl_fix_xattr_to_user(kvalue, size);
> + fix_xattr_to_user(kname, kvalue, size);
> Â if (size && copy_to_user(value, kvalue, error))
> Â error = -EFAULT;
> Â } else if (error == -ERANGE && size >= XATTR_SIZE_MAX) {
Might be nice to move this one to the head of the queue. I don't see it
as being a controversial change, and it could go in before the rest of
the patches.
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
|