From: Dragan Cvetic <draganc@xilinx.com>
To: Harshal Chaudhari <harshalchau04@gmail.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: Derek Kiernan <dkiernan@xilinx.com>,
"arnd@arndb.de" <arnd@arndb.de>,
Michal Simek <michals@xilinx.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] misc: xilinx-sdfec: remove check for ioctl cmd and argument.
Date: Mon, 9 Nov 2020 17:12:47 +0000 [thread overview]
Message-ID: <SN4PR0201MB3472341FB4C4F3C0EA4265A9CBEA0@SN4PR0201MB3472.namprd02.prod.outlook.com> (raw)
In-Reply-To: <20201101170949.18616-1-harshalchau04@gmail.com>
> -----Original Message-----
> From: Harshal Chaudhari <harshalchau04@gmail.com>
> Sent: Sunday 1 November 2020 17:10
> To: gregkh@linuxfoundation.org; Dragan Cvetic <draganc@xilinx.com>
> Cc: Derek Kiernan <dkiernan@xilinx.com>; arnd@arndb.de; Michal Simek <michals@xilinx.com>; linux-arm-
> kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] misc: xilinx-sdfec: remove check for ioctl cmd and argument.
>
> if (_IOC_TYPE(cmd) != PP_IOCTL)
> return -ENOTTY;
>
> Invalid ioctl command check normally performs by “default” case.
>
> if (_IOC_DIR(cmd) != _IOC_NONE) {
> argp = (void __user *)arg;
> if (!argp)
> return -EINVAL; }
>
> And for checking ioctl arguments, copy_from_user()/copy_to_user()
> checks are enough.
>
> Signed-off-by: Harshal Chaudhari <harshalchau04@gmail.com>
> ---
> drivers/misc/xilinx_sdfec.c | 16 +++-------------
> 1 file changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
> index 92291292756a..ff104c894b3b 100644
> --- a/drivers/misc/xilinx_sdfec.c
> +++ b/drivers/misc/xilinx_sdfec.c
> @@ -944,8 +944,8 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> unsigned long data)
> {
> struct xsdfec_dev *xsdfec;
> - void __user *arg = NULL;
> - int rval = -EINVAL;
> + void __user *arg = (void __user *)data;
> + int rval;
>
> xsdfec = container_of(fptr->private_data, struct xsdfec_dev, miscdev);
>
> @@ -956,16 +956,6 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> return -EPERM;
> }
>
> - if (_IOC_TYPE(cmd) != XSDFEC_MAGIC)
> - return -ENOTTY;
> -
> - /* check if ioctl argument is present and valid */
> - if (_IOC_DIR(cmd) != _IOC_NONE) {
> - arg = (void __user *)data;
> - if (!arg)
> - return rval;
> - }
> -
> switch (cmd) {
> case XSDFEC_START_DEV:
> rval = xsdfec_start(xsdfec);
> @@ -1010,7 +1000,7 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> rval = xsdfec_is_active(xsdfec, (bool __user *)arg);
> break;
> default:
> - /* Should not get here */
> + rval = -ENOTTY;
> break;
> }
> return rval;
> --
> 2.17.1
Acked-by: Dragan Cvetic <dragan.cvetic@xilinx.com>
prev parent reply other threads:[~2020-11-09 17:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 17:09 [PATCH] misc: xilinx-sdfec: remove check for ioctl cmd and argument Harshal Chaudhari
2020-11-01 19:49 ` Arnd Bergmann
2020-11-09 17:12 ` Dragan Cvetic [this message]
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=SN4PR0201MB3472341FB4C4F3C0EA4265A9CBEA0@SN4PR0201MB3472.namprd02.prod.outlook.com \
--to=draganc@xilinx.com \
--cc=arnd@arndb.de \
--cc=dkiernan@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=harshalchau04@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michals@xilinx.com \
/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).