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>
Subject: Re: [PATCH 23/29] xfs: lift buffer allocation into xfs_ioc_attr_list
Date: Tue, 21 Jan 2020 10:49:12 -0800 [thread overview]
Message-ID: <20200121184912.GX8247@magnolia> (raw)
In-Reply-To: <20200114081051.297488-24-hch@lst.de>
On Tue, Jan 14, 2020 at 09:10:45AM +0100, Christoph Hellwig wrote:
> Lift the buffer allocation from the two callers into xfs_ioc_attr_list.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_ioctl.c | 39 ++++++++++++++++-----------------------
> fs/xfs/xfs_ioctl.h | 2 +-
> fs/xfs/xfs_ioctl32.c | 22 +++++-----------------
> 3 files changed, 22 insertions(+), 41 deletions(-)
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index a3a6c6882c6f..8d7b8ad21d9e 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -353,13 +353,14 @@ xfs_ioc_attr_put_listent(
> int
> xfs_ioc_attr_list(
> struct xfs_inode *dp,
> - char *buffer,
> + void __user *ubuf,
> int bufsize,
> int flags,
> struct attrlist_cursor_kern *cursor)
> {
> struct xfs_attr_list_context context;
> struct xfs_attrlist *alist;
> + void *buffer;
> int error;
>
> if (bufsize < sizeof(struct xfs_attrlist) ||
> @@ -381,11 +382,9 @@ xfs_ioc_attr_list(
> (cursor->hashval || cursor->blkno || cursor->offset))
> return -EINVAL;
>
> - /*
> - * Check for a properly aligned buffer.
> - */
> - if (((long)buffer) & (sizeof(int)-1))
> - return -EFAULT;
> + buffer = kmem_zalloc_large(bufsize, 0);
> + if (!buffer)
> + return -ENOMEM;
>
> /*
> * Initialize the output buffer.
> @@ -406,7 +405,13 @@ xfs_ioc_attr_list(
> alist->al_offset[0] = context.bufsize;
>
> error = xfs_attr_list(&context);
> - ASSERT(error <= 0);
> + if (error)
> + goto out_free;
> +
> + if (copy_to_user(ubuf, buffer, bufsize))
> + error = -EFAULT;
> +out_free:
> + kmem_free(buffer);
> return error;
> }
>
> @@ -420,7 +425,6 @@ xfs_attrlist_by_handle(
> struct xfs_fsop_attrlist_handlereq __user *p = arg;
> xfs_fsop_attrlist_handlereq_t al_hreq;
> struct dentry *dentry;
> - char *kbuf;
>
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
> @@ -431,26 +435,15 @@ xfs_attrlist_by_handle(
> if (IS_ERR(dentry))
> return PTR_ERR(dentry);
>
> - kbuf = kmem_zalloc_large(al_hreq.buflen, 0);
> - if (!kbuf)
> - goto out_dput;
> -
> cursor = (attrlist_cursor_kern_t *)&al_hreq.pos;
> - error = xfs_ioc_attr_list(XFS_I(d_inode(dentry)), kbuf, al_hreq.buflen,
> - al_hreq.flags, cursor);
> + error = xfs_ioc_attr_list(XFS_I(d_inode(dentry)), al_hreq.buffer,
> + al_hreq.buflen, al_hreq.flags, cursor);
> if (error)
> - goto out_kfree;
> -
> - if (copy_to_user(&p->pos, cursor, sizeof(attrlist_cursor_kern_t))) {
> - error = -EFAULT;
> - goto out_kfree;
> - }
> + goto out_dput;
>
> - if (copy_to_user(al_hreq.buffer, kbuf, al_hreq.buflen))
> + if (copy_to_user(&p->pos, cursor, sizeof(attrlist_cursor_kern_t)))
> error = -EFAULT;
>
> -out_kfree:
> - kmem_free(kbuf);
> out_dput:
> dput(dentry);
> return error;
> diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
> index cb7b94c576a7..ec6448b259fb 100644
> --- a/fs/xfs/xfs_ioctl.h
> +++ b/fs/xfs/xfs_ioctl.h
> @@ -39,7 +39,7 @@ xfs_readlink_by_handle(
> 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);
> -int xfs_ioc_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,
> +int xfs_ioc_attr_list(struct xfs_inode *dp, void __user *ubuf, int bufsize,
> int flags, struct attrlist_cursor_kern *cursor);
>
> extern struct dentry *
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 840d17951407..17e14916757b 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -359,7 +359,6 @@ xfs_compat_attrlist_by_handle(
> compat_xfs_fsop_attrlist_handlereq_t __user *p = arg;
> compat_xfs_fsop_attrlist_handlereq_t al_hreq;
> struct dentry *dentry;
> - char *kbuf;
>
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
> @@ -371,27 +370,16 @@ xfs_compat_attrlist_by_handle(
> if (IS_ERR(dentry))
> return PTR_ERR(dentry);
>
> - error = -ENOMEM;
> - kbuf = kmem_zalloc_large(al_hreq.buflen, 0);
> - if (!kbuf)
> - goto out_dput;
> -
> cursor = (attrlist_cursor_kern_t *)&al_hreq.pos;
> - error = xfs_ioc_attr_list(XFS_I(d_inode(dentry)), kbuf, al_hreq.buflen,
> - al_hreq.flags, cursor);
> + error = xfs_ioc_attr_list(XFS_I(d_inode(dentry)),
> + compat_ptr(al_hreq.buffer), al_hreq.buflen,
> + al_hreq.flags, cursor);
> if (error)
> - goto out_kfree;
> -
> - if (copy_to_user(&p->pos, cursor, sizeof(attrlist_cursor_kern_t))) {
> - error = -EFAULT;
> - goto out_kfree;
> - }
> + goto out_dput;
>
> - if (copy_to_user(compat_ptr(al_hreq.buffer), kbuf, al_hreq.buflen))
> + if (copy_to_user(&p->pos, cursor, sizeof(attrlist_cursor_kern_t)))
> error = -EFAULT;
>
> -out_kfree:
> - kmem_free(kbuf);
> out_dput:
> dput(dentry);
> return error;
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-01-21 18:49 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 8:10 clean up the attr interface v2 Christoph Hellwig
2020-01-14 8:10 ` [PATCH 01/29] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-01-17 0:59 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 02/29] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-01-21 17:28 ` Darrick J. Wong
2020-01-25 4:17 ` Allison Collins
2020-01-25 23:22 ` Christoph Hellwig
2020-01-26 22:23 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 03/29] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-01-21 17:41 ` Darrick J. Wong
2020-01-23 22:33 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 04/29] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-01-21 17:45 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 05/29] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-01-21 17:54 ` Darrick J. Wong
2020-01-23 22:34 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 06/29] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-01-21 17:57 ` Darrick J. Wong
2020-01-23 22:35 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 07/29] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-01-21 18:03 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 08/29] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2020-01-21 18:48 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 09/29] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-01-21 18:07 ` Darrick J. Wong
2020-01-23 22:36 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 10/29] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-01-21 18:10 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 11/29] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-01-21 18:12 ` Darrick J. Wong
2020-01-23 22:39 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 12/29] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-01-21 18:13 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 13/29] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-01-21 18:15 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 14/29] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-01-21 18:17 ` Darrick J. Wong
2020-01-23 22:40 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 15/29] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-01-21 18:20 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 16/29] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-01-21 18:27 ` Darrick J. Wong
2020-01-23 22:41 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 17/29] xfs: cleanup xfs_attr_list_context Christoph Hellwig
2020-01-21 18:30 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 18/29] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-01-21 18:33 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 19/29] xfs: replace ATTR_ENTBASESIZE with offsetoff Christoph Hellwig
2020-01-21 18:36 ` Darrick J. Wong
2020-01-23 22:43 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 20/29] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-01-21 18:41 ` Darrick J. Wong
2020-01-24 23:13 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 21/29] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-01-21 18:42 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 22/29] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-01-21 18:43 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 23/29] xfs: lift buffer allocation " Christoph Hellwig
2020-01-21 18:49 ` Darrick J. Wong [this message]
2020-01-14 8:10 ` [PATCH 24/29] xfs: lift cursor copy in/out " Christoph Hellwig
2020-01-21 18:52 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 25/29] xfs: improve xfs_forget_acl Christoph Hellwig
2020-01-21 18:56 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 26/29] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-01-21 18:57 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 27/29] xfs: clean up the attr flag confusion Christoph Hellwig
2020-01-21 19:44 ` Darrick J. Wong
2020-01-24 23:24 ` Christoph Hellwig
2020-01-25 23:10 ` Christoph Hellwig
2020-01-26 22:24 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 28/29] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-01-21 19:45 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 29/29] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-01-21 19:04 ` Darrick J. Wong
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=20200121184912.GX8247@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.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).