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 01/33] xfs: clear kernel only flags in XFS_IOC_ATTRMULTI_BY_HANDLE
Date: Wed, 18 Dec 2019 13:26:08 -0800 [thread overview]
Message-ID: <20191218212608.GD7489@magnolia> (raw)
In-Reply-To: <20191212105433.1692-2-hch@lst.de>
On Thu, Dec 12, 2019 at 11:54:01AM +0100, Christoph Hellwig wrote:
> Don't allow passing arbitrary flags as they change behavior including
> memory allocation that the call stack is not prepared for.
>
> Fixes: ddbca70cc45c ("xfs: allocate xattr buffer on demand")
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_attr.h | 7 +++++--
> fs/xfs/xfs_ioctl.c | 2 ++
> fs/xfs/xfs_ioctl32.c | 2 ++
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 94badfa1743e..91c2cb14276e 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -26,7 +26,7 @@ struct xfs_attr_list_context;
> *========================================================================*/
>
>
> -#define ATTR_DONTFOLLOW 0x0001 /* -- unused, from IRIX -- */
> +#define ATTR_DONTFOLLOW 0x0001 /* -- ignored, from IRIX -- */
> #define ATTR_ROOT 0x0002 /* use attrs in root (trusted) namespace */
> #define ATTR_TRUST 0x0004 /* -- unused, from IRIX -- */
> #define ATTR_SECURE 0x0008 /* use attrs in security namespace */
> @@ -37,7 +37,10 @@ struct xfs_attr_list_context;
> #define ATTR_KERNOVAL 0x2000 /* [kernel] get attr size only, not value */
>
> #define ATTR_INCOMPLETE 0x4000 /* [kernel] return INCOMPLETE attr keys */
> -#define ATTR_ALLOC 0x8000 /* allocate xattr buffer on demand */
> +#define ATTR_ALLOC 0x8000 /* [kernel] allocate xattr buffer on demand */
> +
> +#define ATTR_KERNEL_FLAGS \
> + (ATTR_KERNOTIME | ATTR_KERNOVAL | ATTR_INCOMPLETE | ATTR_ALLOC)
>
> #define XFS_ATTR_FLAGS \
> { ATTR_DONTFOLLOW, "DONTFOLLOW" }, \
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 7b35d62ede9f..2f76d0a7b818 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -462,6 +462,8 @@ xfs_attrmulti_by_handle(
>
> error = 0;
> for (i = 0; i < am_hreq.opcount; i++) {
> + ops[i].am_flags &= ATTR_KERNEL_FLAGS;
The only flags we allow from userspace are the internal state flags?
Is this supposed to be am_flags &= ~ATTR_KERNEL_FLAGS?
--D
> +
> ops[i].am_error = strncpy_from_user((char *)attr_name,
> ops[i].am_attrname, MAXNAMELEN);
> if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN)
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index c4c4f09113d3..8b5acf8c42e1 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -450,6 +450,8 @@ xfs_compat_attrmulti_by_handle(
>
> error = 0;
> for (i = 0; i < am_hreq.opcount; i++) {
> + ops[i].am_flags &= ATTR_KERNEL_FLAGS;
> +
> ops[i].am_error = strncpy_from_user((char *)attr_name,
> compat_ptr(ops[i].am_attrname),
> MAXNAMELEN);
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-12-18 21:26 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 10:54 clean up the attr interface Christoph Hellwig
2019-12-12 10:54 ` [PATCH 01/33] xfs: clear kernel only flags in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2019-12-18 21:26 ` Darrick J. Wong [this message]
2019-12-24 11:56 ` Christoph Hellwig
2019-12-12 10:54 ` [PATCH 02/33] xfs: reject invalid flags combinations " Christoph Hellwig
2019-12-18 21:29 ` Darrick J. Wong
2019-12-24 11:56 ` Christoph Hellwig
2019-12-12 10:54 ` [PATCH 03/33] xfs: also remove cached ACLs when removing the underlying attr Christoph Hellwig
2019-12-18 21:31 ` Darrick J. Wong
2019-12-24 11:57 ` Christoph Hellwig
2019-12-12 10:54 ` [PATCH 04/33] xfs: fix misuse of the XFS_ATTR_INCOMPLETE flag Christoph Hellwig
2019-12-18 21:33 ` Darrick J. Wong
2019-12-12 10:54 ` [PATCH 05/33] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2019-12-18 21:43 ` Darrick J. Wong
2019-12-24 11:59 ` Christoph Hellwig
2019-12-12 10:54 ` [PATCH 06/33] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2019-12-12 10:54 ` [PATCH 07/33] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2019-12-12 10:54 ` [PATCH 08/33] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2019-12-12 10:54 ` [PATCH 09/33] xfs: factour out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2019-12-12 10:54 ` [PATCH 10/33] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2019-12-12 10:54 ` [PATCH 11/33] xfs: remove the MAXNAMELEN " Christoph Hellwig
2019-12-12 10:54 ` [PATCH 12/33] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2019-12-12 10:54 ` [PATCH 13/33] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2019-12-12 10:54 ` [PATCH 14/33] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2019-12-12 10:54 ` [PATCH 15/33] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2019-12-12 10:54 ` [PATCH 16/33] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2019-12-12 10:54 ` [PATCH 17/33] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2019-12-12 10:54 ` [PATCH 18/33] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2019-12-12 10:54 ` [PATCH 19/33] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2019-12-12 10:54 ` [PATCH 20/33] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2019-12-12 10:54 ` [PATCH 21/33] xfs: cleanup xfs_attr_list_context Christoph Hellwig
2019-12-12 10:54 ` [PATCH 22/33] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2019-12-12 10:54 ` [PATCH 23/33] xfs: replace ATTR_ENTBASESIZE with offsetoff Christoph Hellwig
2019-12-12 10:54 ` [PATCH 24/33] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2019-12-12 10:54 ` [PATCH 25/33] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2019-12-12 10:54 ` [PATCH 26/33] xfs: lift common check into xfs_ioc_attr_list Christoph Hellwig
2019-12-12 10:54 ` [PATCH 27/33] xfs: lift buffer allocation " Christoph Hellwig
2019-12-12 10:54 ` [PATCH 28/33] xfs: lift cursor copy in/out " Christoph Hellwig
2019-12-12 10:54 ` [PATCH 29/33] xfs: improve xfs_forget_acl Christoph Hellwig
2019-12-12 10:54 ` [PATCH 30/33] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2019-12-12 10:54 ` [PATCH 31/33] xfs: clean up the attr flag confusion Christoph Hellwig
2019-12-12 10:54 ` [PATCH 32/33] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2019-12-12 10:54 ` [PATCH 33/33] xfs: embedded the attrlist cursor into struct xfs_attr_list_context 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=20191218212608.GD7489@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).