From: Daniel Vetter <daniel@ffwll.ch>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [patch] drm/i915: dereferencing an error pointer
Date: Tue, 17 Jul 2012 10:22:14 +0200 [thread overview]
Message-ID: <20120717082214.GA5498@phenom.ffwll.local> (raw)
In-Reply-To: <20120717064449.GB14985@elgon.mountain>
On Tue, Jul 17, 2012 at 09:44:49AM +0300, Dan Carpenter wrote:
> We need to check that "ctx" is a valid pointer before dereferencing it.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Queued for drm-intel-next, thanks for the patch.
-Daniel
> ---
> Applies to linux-next.
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 9ae3f2c..a82c0ec 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -496,11 +496,13 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
>
> ctx = create_hw_context(dev, file_priv);
> mutex_unlock(&dev->struct_mutex);
> + if (IS_ERR(ctx))
> + return PTR_ERR(ctx);
>
> args->ctx_id = ctx->id;
> DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id);
>
> - return PTR_RET(ctx);
> + return 0;
> }
>
> int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
prev parent reply other threads:[~2012-07-17 8:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 6:44 [patch] drm/i915: dereferencing an error pointer Dan Carpenter
2012-07-17 8:22 ` Daniel Vetter [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=20120717082214.GA5498@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=dan.carpenter@oracle.com \
--cc=daniel.vetter@ffwll.ch \
--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