From: Chandan Rajendra <chandan@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org,
Allison Collins <allison.henderson@oracle.com>,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: Re: [PATCH 23/30] xfs: lift common checks into xfs_ioc_attr_list
Date: Sun, 09 Feb 2020 13:33:38 +0530 [thread overview]
Message-ID: <1812060.WSnF9zcqM7@localhost.localdomain> (raw)
In-Reply-To: <20200129170310.51370-24-hch@lst.de>
On Wednesday, January 29, 2020 10:33 PM Christoph Hellwig wrote:
> Lift the flags and bufsize checks from both callers into the common code
> in xfs_ioc_attr_list.
>
Logically, code flow remains the same.
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_ioctl.c | 23 ++++++++++++-----------
> fs/xfs/xfs_ioctl32.c | 11 -----------
> 2 files changed, 12 insertions(+), 22 deletions(-)
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 0f9326bc055c..c8814808a551 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -360,6 +360,18 @@ xfs_ioc_attr_list(
> struct xfs_attrlist *alist;
> int error;
>
> + if (bufsize < sizeof(struct xfs_attrlist) ||
> + bufsize > XFS_XATTR_LIST_MAX)
> + return -EINVAL;
> +
> + /*
> + * Reject flags, only allow namespaces.
> + */
> + if (flags & ~(ATTR_ROOT | ATTR_SECURE))
> + return -EINVAL;
> + if (flags == (ATTR_ROOT | ATTR_SECURE))
> + return -EINVAL;
> +
> /*
> * Validate the cursor.
> */
> @@ -414,17 +426,6 @@ xfs_attrlist_by_handle(
> return -EPERM;
> if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))
> return -EFAULT;
> - if (al_hreq.buflen < sizeof(struct xfs_attrlist) ||
> - al_hreq.buflen > XFS_XATTR_LIST_MAX)
> - return -EINVAL;
> -
> - /*
> - * Reject flags, only allow namespaces.
> - */
> - if (al_hreq.flags & ~(ATTR_ROOT | ATTR_SECURE))
> - return -EINVAL;
> - if (al_hreq.flags == (ATTR_ROOT | ATTR_SECURE))
> - return -EINVAL;
>
> dentry = xfs_handlereq_to_dentry(parfilp, &al_hreq.hreq);
> if (IS_ERR(dentry))
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 10ea0222954c..840d17951407 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -366,17 +366,6 @@ xfs_compat_attrlist_by_handle(
> if (copy_from_user(&al_hreq, arg,
> sizeof(compat_xfs_fsop_attrlist_handlereq_t)))
> return -EFAULT;
> - if (al_hreq.buflen < sizeof(struct xfs_attrlist) ||
> - al_hreq.buflen > XFS_XATTR_LIST_MAX)
> - return -EINVAL;
> -
> - /*
> - * Reject flags, only allow namespaces.
> - */
> - if (al_hreq.flags & ~(ATTR_ROOT | ATTR_SECURE))
> - return -EINVAL;
> - if (al_hreq.flags == (ATTR_ROOT | ATTR_SECURE))
> - return -EINVAL;
>
> dentry = xfs_compat_handlereq_to_dentry(parfilp, &al_hreq.hreq);
> if (IS_ERR(dentry))
>
--
chandan
next prev parent reply other threads:[~2020-02-09 8:01 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 17:02 clean up the attr interface v3 Christoph Hellwig
2020-01-29 17:02 ` [PATCH 01/30] xfs: reject invalid flags combinations in XFS_IOC_ATTRLIST_BY_HANDLE Christoph Hellwig
2020-02-05 13:46 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 02/30] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-01-29 17:02 ` [PATCH 03/30] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-02-06 8:00 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 04/30] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-02-06 9:21 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 05/30] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-02-06 10:33 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 06/30] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-07 5:20 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 07/30] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-02-07 6:15 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 08/30] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-02-07 6:56 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 09/30] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2020-01-29 17:02 ` [PATCH 10/30] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-01-29 17:02 ` [PATCH 11/30] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-02-07 9:42 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:02 ` [PATCH 12/30] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-02-07 13:13 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 13/30] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-02-07 13:19 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 14/30] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-02-08 4:36 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 15/30] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-02-08 5:13 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 16/30] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-02-08 11:35 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 17/30] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-02-08 12:48 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 18/30] xfs: cleanup struct xfs_attr_list_context Christoph Hellwig
2020-02-08 15:53 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 19/30] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-01-29 17:02 ` [PATCH 20/30] xfs: open code ATTR_ENTSIZE Christoph Hellwig
2020-02-09 6:57 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 21/30] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-02-09 7:44 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:03 ` [PATCH 22/30] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-02-09 7:52 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 23/30] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-02-09 8:03 ` Chandan Rajendra [this message]
2020-01-29 17:03 ` [PATCH 24/30] xfs: lift buffer allocation " Christoph Hellwig
2020-02-09 8:24 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 25/30] xfs: lift cursor copy in/out " Christoph Hellwig
2020-02-10 6:02 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 26/30] xfs: improve xfs_forget_acl Christoph Hellwig
2020-02-10 6:45 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:03 ` [PATCH 27/30] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-02-10 6:57 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 28/30] xfs: clean up the attr flag confusion Christoph Hellwig
2020-02-10 13:19 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 29/30] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-02-10 13:59 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 30/30] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-02-10 14:57 ` Chandan Rajendra
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=1812060.WSnF9zcqM7@localhost.localdomain \
--to=chandan@linux.ibm.com \
--cc=allison.henderson@oracle.com \
--cc=darrick.wong@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).