linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Jiri Kosina <jikos@kernel.org>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] HID: hidraw: switch to using memdup_user
Date: Thu, 17 Mar 2016 09:08:10 +0100	[thread overview]
Message-ID: <20160317080810.GS22340@mail.corp.redhat.com> (raw)
In-Reply-To: <20160316235938.GA23827@dtor-ws>

On Mar 16 2016 or thereabouts, Dmitry Torokhov wrote:
> Instead of open-coding memory allocation and copying form user memory
> sequence let's use memdup_user().
> 
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---

Works for me:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Cheers,
Benjamin

>  drivers/hid/hidraw.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
> index 9c2d7c2..b9a76e3 100644
> --- a/drivers/hid/hidraw.c
> +++ b/drivers/hid/hidraw.c
> @@ -34,6 +34,7 @@
>  #include <linux/hid.h>
>  #include <linux/mutex.h>
>  #include <linux/sched.h>
> +#include <linux/string.h>
>  
>  #include <linux/hidraw.h>
>  
> @@ -123,7 +124,6 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer,
>  
>  	dev = hidraw_table[minor]->hid;
>  
> -
>  	if (count > HID_MAX_BUFFER_SIZE) {
>  		hid_warn(dev, "pid %d passed too large report\n",
>  			 task_pid_nr(current));
> @@ -138,17 +138,12 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer,
>  		goto out;
>  	}
>  
> -	buf = kmalloc(count * sizeof(__u8), GFP_KERNEL);
> -	if (!buf) {
> -		ret = -ENOMEM;
> +	buf = memdup_user(buffer, count);
> +	if (IS_ERR(buf)) {
> +		ret = PTR_ERR(buf);
>  		goto out;
>  	}
>  
> -	if (copy_from_user(buf, buffer, count)) {
> -		ret = -EFAULT;
> -		goto out_free;
> -	}
> -
>  	if ((report_type == HID_OUTPUT_REPORT) &&
>  	    !(dev->quirks & HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP)) {
>  		ret = hid_hw_output_report(dev, buf, count);
> -- 
> 2.7.0.rc3.207.g0ac5344
> 
> 
> -- 
> Dmitry

  reply	other threads:[~2016-03-17  8:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 23:59 [PATCH] HID: hidraw: switch to using memdup_user Dmitry Torokhov
2016-03-17  8:08 ` Benjamin Tissoires [this message]
2016-03-24 14:22 ` Jiri Kosina

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=20160317080810.GS22340@mail.corp.redhat.com \
    --to=benjamin.tissoires@redhat.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@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).