From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: Chandan Rajendra <chandanrlinux@gmail.com>,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH 05/30] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE
Date: Tue, 25 Feb 2020 15:09:47 -0800 [thread overview]
Message-ID: <20200225231012.735245-6-hch@lst.de> (raw)
In-Reply-To: <20200225231012.735245-1-hch@lst.de>
Simplify the user copy code by using strndup_user. This means that we
now do one memory allocation per operation instead of one per ioctl,
but memory allocations are cheap compared to the actual file system
operations. Also the error for an invalid path is now EINVAL or EFAULT
instead of the previous odd and undocumented ERANGE.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_ioctl.c | 17 +++++------------
fs/xfs/xfs_ioctl32.c | 17 +++++------------
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index b806003caacd..bb490a954c0b 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -448,11 +448,6 @@ xfs_attrmulti_by_handle(
goto out_dput;
}
- error = -ENOMEM;
- attr_name = kmalloc(MAXNAMELEN, GFP_KERNEL);
- if (!attr_name)
- goto out_kfree_ops;
-
error = 0;
for (i = 0; i < am_hreq.opcount; i++) {
if ((ops[i].am_flags & ATTR_ROOT) &&
@@ -462,12 +457,11 @@ xfs_attrmulti_by_handle(
}
ops[i].am_flags &= ~ATTR_KERNEL_FLAGS;
- 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)
- error = -ERANGE;
- if (ops[i].am_error < 0)
+ 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:
@@ -498,13 +492,12 @@ xfs_attrmulti_by_handle(
default:
ops[i].am_error = -EINVAL;
}
+ kfree(attr_name);
}
if (copy_to_user(am_hreq.ops, ops, size))
error = -EFAULT;
- kfree(attr_name);
- out_kfree_ops:
kfree(ops);
out_dput:
dput(dentry);
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index e085f304e539..936c2f62fb6c 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -445,11 +445,6 @@ xfs_compat_attrmulti_by_handle(
goto out_dput;
}
- error = -ENOMEM;
- attr_name = kmalloc(MAXNAMELEN, GFP_KERNEL);
- if (!attr_name)
- goto out_kfree_ops;
-
error = 0;
for (i = 0; i < am_hreq.opcount; i++) {
if ((ops[i].am_flags & ATTR_ROOT) &&
@@ -459,13 +454,12 @@ xfs_compat_attrmulti_by_handle(
}
ops[i].am_flags &= ~ATTR_KERNEL_FLAGS;
- ops[i].am_error = strncpy_from_user((char *)attr_name,
- compat_ptr(ops[i].am_attrname),
+ attr_name = strndup_user(compat_ptr(ops[i].am_attrname),
MAXNAMELEN);
- if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN)
- error = -ERANGE;
- if (ops[i].am_error < 0)
+ if (IS_ERR(attr_name)) {
+ ops[i].am_error = PTR_ERR(attr_name);
break;
+ }
switch (ops[i].am_opcode) {
case ATTR_OP_GET:
@@ -496,13 +490,12 @@ xfs_compat_attrmulti_by_handle(
default:
ops[i].am_error = -EINVAL;
}
+ kfree(attr_name);
}
if (copy_to_user(compat_ptr(am_hreq.ops), ops, size))
error = -EFAULT;
- kfree(attr_name);
- out_kfree_ops:
kfree(ops);
out_dput:
dput(dentry);
--
2.24.1
next prev parent reply other threads:[~2020-02-25 23:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 23:09 clean up the attr interface v6 Christoph Hellwig
2020-02-25 23:09 ` [PATCH 01/30] xfs: reject invalid flags combinations in XFS_IOC_ATTRLIST_BY_HANDLE Christoph Hellwig
2020-02-25 23:09 ` [PATCH 02/30] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-02-25 23:09 ` [PATCH 03/30] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-02-26 16:24 ` Darrick J. Wong
2020-02-25 23:09 ` [PATCH 04/30] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-02-25 23:09 ` Christoph Hellwig [this message]
2020-02-25 23:51 ` [PATCH 05/30] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Dave Chinner
2020-02-25 23:09 ` [PATCH 06/30] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-25 23:55 ` Dave Chinner
2020-02-25 23:09 ` [PATCH 07/30] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-02-25 23:09 ` [PATCH 08/30] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-02-25 23:09 ` [PATCH 09/30] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-02-25 23:55 ` Dave Chinner
2020-02-25 23:09 ` [PATCH 10/30] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-02-26 0:21 ` Dave Chinner
2020-02-26 15:07 ` Christoph Hellwig
2020-02-25 23:09 ` [PATCH 11/30] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-02-26 0:33 ` Dave Chinner
2020-02-26 15:10 ` Christoph Hellwig
2020-02-25 23:09 ` [PATCH 12/30] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-02-25 23:09 ` [PATCH 13/30] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-02-25 23:09 ` [PATCH 14/30] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-02-25 23:09 ` [PATCH 15/30] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-02-25 23:09 ` [PATCH 16/30] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-02-25 23:09 ` [PATCH 17/30] xfs: cleanup struct xfs_attr_list_context Christoph Hellwig
2020-02-25 23:10 ` [PATCH 18/30] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-02-25 23:10 ` [PATCH 19/30] xfs: open code ATTR_ENTSIZE Christoph Hellwig
2020-02-25 23:10 ` [PATCH 20/30] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-02-25 23:10 ` [PATCH 21/30] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-02-25 23:10 ` [PATCH 22/30] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-02-25 23:10 ` [PATCH 23/30] xfs: lift buffer allocation " Christoph Hellwig
2020-02-25 23:10 ` [PATCH 24/30] xfs: lift cursor copy in/out " Christoph Hellwig
2020-02-25 23:10 ` [PATCH 25/30] xfs: improve xfs_forget_acl Christoph Hellwig
2020-02-25 23:10 ` [PATCH 26/30] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-02-26 0:36 ` Dave Chinner
2020-02-25 23:10 ` [PATCH 27/30] xfs: clean up the attr flag confusion Christoph Hellwig
2020-02-26 1:03 ` Dave Chinner
2020-02-26 15:14 ` Christoph Hellwig
2020-02-26 15:18 ` Christoph Hellwig
2020-02-25 23:10 ` [PATCH 28/30] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-02-26 1:03 ` Dave Chinner
2020-02-25 23:10 ` [PATCH 29/30] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-02-25 23:10 ` [PATCH 30/30] xfs: clean up bufsize alignment in xfs_ioc_attr_list Christoph Hellwig
2020-02-26 1:04 ` Dave Chinner
2020-02-26 16:27 ` clean up the attr interface v6 Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-01-29 17:02 clean up the attr interface v3 Christoph Hellwig
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
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=20200225231012.735245-6-hch@lst.de \
--to=hch@lst.de \
--cc=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--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).