From: Dan Carpenter <error27@gmail.com>
To: David Airlie <airlied@linux.ie>
Cc: kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [patch] i915: return -EFAULT if copy_to_user fails
Date: Mon, 23 Aug 2010 11:22:16 +0000 [thread overview]
Message-ID: <20100823111941.GI6674@bicker> (raw)
In-Reply-To: <20100619131251.GB5467@bicker>
On Sat, Jun 19, 2010 at 03:12:51PM +0200, Dan Carpenter wrote:
> copy_to_user returns the number of bytes remaining to be copied, but we
> want to return a negative error code here. These are returned to
> userspace.
>
I didn't get a response on this patch.
regards,
dan carpenter
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 59a2bf8..5fd876e 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -608,8 +608,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
> ret = copy_from_user(cliprects, batch->cliprects,
> batch->num_cliprects *
> sizeof(struct drm_clip_rect));
> - if (ret != 0)
> + if (ret != 0) {
> + ret = -EFAULT;
> goto fail_free;
> + }
> }
>
> mutex_lock(&dev->struct_mutex);
> @@ -650,8 +652,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
> return -ENOMEM;
>
> ret = copy_from_user(batch_data, cmdbuf->buf, cmdbuf->sz);
> - if (ret != 0)
> + if (ret != 0) {
> + ret = -EFAULT;
> goto fail_batch_free;
> + }
>
> if (cmdbuf->num_cliprects) {
> cliprects = kcalloc(cmdbuf->num_cliprects,
> @@ -664,8 +668,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
> ret = copy_from_user(cliprects, cmdbuf->cliprects,
> cmdbuf->num_cliprects *
> sizeof(struct drm_clip_rect));
> - if (ret != 0)
> + if (ret != 0) {
> + ret = -EFAULT;
> goto fail_clip_free;
> + }
> }
>
> mutex_lock(&dev->struct_mutex);
next prev parent reply other threads:[~2010-08-23 11:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-19 13:12 [patch] i915: return -EFAULT if copy_to_user fails Dan Carpenter
2010-06-23 17:03 ` Dan Carpenter
2010-08-23 11:24 ` Dan Carpenter
2010-08-23 11:36 ` Chris Wilson
2010-08-23 11:22 ` Dan Carpenter [this message]
2010-08-23 11:37 ` Chris Wilson
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=20100823111941.GI6674@bicker \
--to=error27@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel-janitors@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