From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org,
Allison Collins <allison.henderson@oracle.com>,
Chandan Rajendra <chandanrlinux@gmail.com>
Subject: Re: [PATCH 06/31] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op
Date: Fri, 21 Feb 2020 07:17:27 -0800 [thread overview]
Message-ID: <20200221151727.GI9506@magnolia> (raw)
In-Reply-To: <20200221141154.476496-7-hch@lst.de>
On Fri, Feb 21, 2020 at 06:11:29AM -0800, Christoph Hellwig wrote:
> Add a new helper to handle a single attr multi ioctl operation that
> can be shared between the native and compat ioctl implementation.
>
> There is a slight change in heavior in that we don't break out of the
> loop when copying in the attribute name fails. The previous behavior
> was rather inconsistent here as it continued for any other kind of
> error, and that we don't clear the flags in the structure returned
> to userspace, a behavior only introduced as a bug fix in the last
> merge window.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Seems pretty straightforward,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_ioctl.c | 97 +++++++++++++++++++++++---------------------
> fs/xfs/xfs_ioctl.h | 18 ++------
> fs/xfs/xfs_ioctl32.c | 50 +++--------------------
> 3 files changed, 59 insertions(+), 106 deletions(-)
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index bb490a954c0b..b17458c8947e 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -349,7 +349,7 @@ xfs_attrlist_by_handle(
> return error;
> }
>
> -int
> +static int
> xfs_attrmulti_attr_get(
> struct inode *inode,
> unsigned char *name,
> @@ -381,7 +381,7 @@ xfs_attrmulti_attr_get(
> return error;
> }
>
> -int
> +static int
> xfs_attrmulti_attr_set(
> struct inode *inode,
> unsigned char *name,
> @@ -412,6 +412,51 @@ xfs_attrmulti_attr_set(
> return error;
> }
>
> +int
> +xfs_ioc_attrmulti_one(
> + struct file *parfilp,
> + struct inode *inode,
> + uint32_t opcode,
> + void __user *uname,
> + void __user *value,
> + uint32_t *len,
> + uint32_t flags)
> +{
> + unsigned char *name;
> + int error;
> +
> + if ((flags & ATTR_ROOT) && (flags & ATTR_SECURE))
> + return -EINVAL;
> + flags &= ~ATTR_KERNEL_FLAGS;
> +
> + name = strndup_user(uname, MAXNAMELEN);
> + if (IS_ERR(name))
> + return PTR_ERR(name);
> +
> + switch (opcode) {
> + case ATTR_OP_GET:
> + error = xfs_attrmulti_attr_get(inode, name, value, len, flags);
> + break;
> + case ATTR_OP_REMOVE:
> + value = NULL;
> + *len = 0;
> + /* fall through */
> + case ATTR_OP_SET:
> + error = mnt_want_write_file(parfilp);
> + if (error)
> + break;
> + error = xfs_attrmulti_attr_set(inode, name, value, *len, flags);
> + mnt_drop_write_file(parfilp);
> + break;
> + default:
> + error = -EINVAL;
> + break;
> + }
> +
> + kfree(name);
> + return error;
> +}
> +
> STATIC int
> xfs_attrmulti_by_handle(
> struct file *parfilp,
> @@ -422,7 +467,6 @@ xfs_attrmulti_by_handle(
> xfs_fsop_attrmulti_handlereq_t am_hreq;
> struct dentry *dentry;
> unsigned int i, size;
> - unsigned char *attr_name;
>
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
> @@ -450,49 +494,10 @@ xfs_attrmulti_by_handle(
>
> error = 0;
> for (i = 0; i < am_hreq.opcount; i++) {
> - if ((ops[i].am_flags & ATTR_ROOT) &&
> - (ops[i].am_flags & ATTR_SECURE)) {
> - ops[i].am_error = -EINVAL;
> - continue;
> - }
> - ops[i].am_flags &= ~ATTR_KERNEL_FLAGS;
> -
> - attr_name = strndup_user(ops[i].am_attrname, MAXNAMELEN);
> - if (IS_ERR(attr_name)) {
> - ops[i].am_error = PTR_ERR(attr_name);
> - break;
> - }
> -
> - switch (ops[i].am_opcode) {
> - case ATTR_OP_GET:
> - ops[i].am_error = xfs_attrmulti_attr_get(
> - d_inode(dentry), attr_name,
> - ops[i].am_attrvalue, &ops[i].am_length,
> - ops[i].am_flags);
> - break;
> - case ATTR_OP_SET:
> - ops[i].am_error = mnt_want_write_file(parfilp);
> - if (ops[i].am_error)
> - break;
> - ops[i].am_error = xfs_attrmulti_attr_set(
> - d_inode(dentry), attr_name,
> - ops[i].am_attrvalue, ops[i].am_length,
> - ops[i].am_flags);
> - mnt_drop_write_file(parfilp);
> - break;
> - case ATTR_OP_REMOVE:
> - ops[i].am_error = mnt_want_write_file(parfilp);
> - if (ops[i].am_error)
> - break;
> - ops[i].am_error = xfs_attrmulti_attr_set(
> - d_inode(dentry), attr_name, NULL, 0,
> - ops[i].am_flags);
> - mnt_drop_write_file(parfilp);
> - break;
> - default:
> - ops[i].am_error = -EINVAL;
> - }
> - kfree(attr_name);
> + ops[i].am_error = xfs_ioc_attrmulti_one(parfilp,
> + d_inode(dentry), ops[i].am_opcode,
> + ops[i].am_attrname, ops[i].am_attrvalue,
> + &ops[i].am_length, ops[i].am_flags);
> }
>
> if (copy_to_user(am_hreq.ops, ops, size))
> diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
> index 819504df00ae..bb50cb3dc61f 100644
> --- a/fs/xfs/xfs_ioctl.h
> +++ b/fs/xfs/xfs_ioctl.h
> @@ -30,21 +30,9 @@ xfs_readlink_by_handle(
> struct file *parfilp,
> xfs_fsop_handlereq_t *hreq);
>
> -extern int
> -xfs_attrmulti_attr_get(
> - struct inode *inode,
> - unsigned char *name,
> - unsigned char __user *ubuf,
> - uint32_t *len,
> - uint32_t flags);
> -
> -extern int
> -xfs_attrmulti_attr_set(
> - struct inode *inode,
> - unsigned char *name,
> - const unsigned char __user *ubuf,
> - uint32_t len,
> - uint32_t flags);
> +int xfs_ioc_attrmulti_one(struct file *parfilp, struct inode *inode,
> + uint32_t opcode, void __user *uname, void __user *value,
> + uint32_t *len, uint32_t flags);
>
> extern struct dentry *
> xfs_handle_to_dentry(
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 936c2f62fb6c..e1daf095c585 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -418,7 +418,6 @@ xfs_compat_attrmulti_by_handle(
> compat_xfs_fsop_attrmulti_handlereq_t am_hreq;
> struct dentry *dentry;
> unsigned int i, size;
> - unsigned char *attr_name;
>
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
> @@ -447,50 +446,11 @@ xfs_compat_attrmulti_by_handle(
>
> error = 0;
> for (i = 0; i < am_hreq.opcount; i++) {
> - if ((ops[i].am_flags & ATTR_ROOT) &&
> - (ops[i].am_flags & ATTR_SECURE)) {
> - ops[i].am_error = -EINVAL;
> - continue;
> - }
> - ops[i].am_flags &= ~ATTR_KERNEL_FLAGS;
> -
> - attr_name = strndup_user(compat_ptr(ops[i].am_attrname),
> - MAXNAMELEN);
> - if (IS_ERR(attr_name)) {
> - ops[i].am_error = PTR_ERR(attr_name);
> - break;
> - }
> -
> - switch (ops[i].am_opcode) {
> - case ATTR_OP_GET:
> - ops[i].am_error = xfs_attrmulti_attr_get(
> - d_inode(dentry), attr_name,
> - compat_ptr(ops[i].am_attrvalue),
> - &ops[i].am_length, ops[i].am_flags);
> - break;
> - case ATTR_OP_SET:
> - ops[i].am_error = mnt_want_write_file(parfilp);
> - if (ops[i].am_error)
> - break;
> - ops[i].am_error = xfs_attrmulti_attr_set(
> - d_inode(dentry), attr_name,
> - compat_ptr(ops[i].am_attrvalue),
> - ops[i].am_length, ops[i].am_flags);
> - mnt_drop_write_file(parfilp);
> - break;
> - case ATTR_OP_REMOVE:
> - ops[i].am_error = mnt_want_write_file(parfilp);
> - if (ops[i].am_error)
> - break;
> - ops[i].am_error = xfs_attrmulti_attr_set(
> - d_inode(dentry), attr_name, NULL, 0,
> - ops[i].am_flags);
> - mnt_drop_write_file(parfilp);
> - break;
> - default:
> - ops[i].am_error = -EINVAL;
> - }
> - kfree(attr_name);
> + ops[i].am_error = xfs_ioc_attrmulti_one(parfilp,
> + d_inode(dentry), ops[i].am_opcode,
> + compat_ptr(ops[i].am_attrname),
> + compat_ptr(ops[i].am_attrvalue),
> + &ops[i].am_length, ops[i].am_flags);
> }
>
> if (copy_to_user(compat_ptr(am_hreq.ops), ops, size))
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-02-21 15:17 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 14:11 clean up the attr interface v5 Christoph Hellwig
2020-02-21 14:11 ` [PATCH 01/31] xfs: reject invalid flags combinations in XFS_IOC_ATTRLIST_BY_HANDLE Christoph Hellwig
2020-02-21 14:11 ` [PATCH 02/31] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-02-21 14:11 ` [PATCH 03/31] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-02-21 15:15 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 04/31] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-02-21 14:11 ` [PATCH 05/31] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-02-21 14:11 ` [PATCH 06/31] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-21 15:17 ` Darrick J. Wong [this message]
2020-02-21 14:11 ` [PATCH 07/31] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-02-21 14:11 ` [PATCH 08/31] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-02-21 14:11 ` [PATCH 09/31] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2020-02-21 22:57 ` Dave Chinner
2020-02-24 19:56 ` Christoph Hellwig
2020-02-21 14:11 ` [PATCH 10/31] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-02-21 14:11 ` [PATCH 11/31] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-02-21 14:11 ` [PATCH 12/31] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-02-21 14:11 ` [PATCH 13/31] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-02-21 14:11 ` [PATCH 14/31] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-02-21 14:11 ` [PATCH 15/31] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-02-21 15:19 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 16/31] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-02-21 14:11 ` [PATCH 17/31] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-02-21 14:11 ` [PATCH 18/31] xfs: cleanup struct xfs_attr_list_context Christoph Hellwig
2020-02-21 14:11 ` [PATCH 19/31] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-02-21 14:11 ` [PATCH 20/31] xfs: open code ATTR_ENTSIZE Christoph Hellwig
2020-02-21 15:21 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 21/31] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-02-21 15:23 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 22/31] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-02-21 14:11 ` [PATCH 23/31] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-02-21 14:11 ` [PATCH 24/31] xfs: lift buffer allocation " Christoph Hellwig
2020-02-21 14:11 ` [PATCH 25/31] xfs: lift cursor copy in/out " Christoph Hellwig
2020-02-21 14:11 ` [PATCH 26/31] xfs: improve xfs_forget_acl Christoph Hellwig
2020-02-21 14:11 ` [PATCH 27/31] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-02-21 14:11 ` [PATCH 28/31] xfs: clean up the attr flag confusion Christoph Hellwig
2020-02-21 15:26 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 29/31] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-02-21 15:27 ` Darrick J. Wong
2020-02-21 14:11 ` [PATCH 30/31] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-02-21 14:11 ` [PATCH 31/31] xfs: clean up bufsize alignment in xfs_ioc_attr_list Christoph Hellwig
2020-02-21 15:28 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-02-17 12:59 clean up the attr interface v4 Christoph Hellwig
2020-02-17 12:59 ` [PATCH 06/31] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-17 22:28 ` Dave Chinner
2020-02-18 15:28 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221151727.GI9506@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).